valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
78,232 Commits 24 Branches 182 Tags 341 MiB
72d2188cbb
Commit Graph

78232 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Isa
72d2188cbb return true when symlinks already in desired state 2017-02-13 18:10:28 -08:00
Joseph Hall
ff763b0515 Add repo commands to SPM (#39375) 
* Add repo commands to SPM

* Add package versions to repo packages list

* Add package search to repo command
 2017-02-13 17:04:13 -07:00
Mike Place
3ec9e043fa Merge pull request #39306 from markuskramerIgitt/writing_documentation 
rst table requires plus-signs for column
 2017-02-13 14:59:08 -07:00
Mike Place
d037045653 Merge pull request #39274 from markuskramerIgitt/develop 
Optionally format version conforming to Windows msi numbering scheme.
 2017-02-13 14:48:16 -07:00
Mike Place
dcd9ff471f Merge pull request #39302 from terminalmage/loader-virtual-aliases 
Add __virtual_aliases__ feature to the loader
 2017-02-13 13:22:02 -07:00
Mike Place
7b2f6088b7 Merge pull request #39366 from dglloyd/patch-1 
Pass sig to service.status in after_toggle
 2017-02-13 13:19:49 -07:00
Mike Place
1951216b22 Merge pull request #39320 from s0undt3ch/features/py3 
Py3 Fixes
 2017-02-13 12:28:32 -07:00
Pedro Algarvio
718afddf51 Don't use repr 2017-02-13 19:23:58 +00:00
Mike Place
547498f8db Merge pull request #39319 from bricewge/develop 
fix  #39318
 2017-02-13 11:56:56 -07:00
Mike Place
fbb6cddcc2 Merge pull request #39330 from steinliber/repair_aliyun_api_problem 
repair aliyun api problem
 2017-02-13 11:51:12 -07:00
Mike Place
4aab734c58 Merge pull request #39332 from morganwillcock/shutdown-state 
Add shutdown and reboot functions to win_system state module
 2017-02-13 11:50:05 -07:00
Mike Place
1b5c1fcb21 Merge pull request #39352 from Unity-Technologies/hotfix/adb_no_devices 
Fix adb beacon when there are no devices
 2017-02-13 10:46:37 -07:00
Dan Lloyd
bbe0389692 Pass sig to service.status in after_toggle 
As on line 350, pass `sig` to `service.status` to ensure that the correct behavior is used. If we don't pass `sig`, upstart/sysv jobs that do not implement `service <name> status` will fail.
 2017-02-13 12:39:09 -05:00
Pedro Algarvio
5ade2a6854
Fix inspect code under Py3 and a little more helpful error message. 2017-02-13 16:52:13 +00:00
Pedro Algarvio
9f73b240c1
Under Py3, we get bytes when using the roots backend directly 2017-02-13 16:44:30 +00:00
Pedro Algarvio
e53972f8c6
Convert fileserver data from bytes to strings 2017-02-13 16:44:09 +00:00
William Giokas
0647dc8aab doc: Fix the Nix documentation (#39343) 2017-02-13 09:42:37 -07:00
Mike Place
41220e799f Merge pull request #39356 from cloudflare/table_out_fix 
Fix table outputter opts
 2017-02-13 09:27:06 -07:00
Pedro Algarvio
ff1667c6d6
We really don't need to decode the string prior to writing it to file. 
Plus, this also avoids handling Py2 and Py3 differently.
 2017-02-13 16:25:09 +00:00
Pedro Algarvio
89e67f0934
We need to feed bytes to the hash function under Py3 2017-02-13 16:19:02 +00:00
Mircea Ulinic
6539f4b86b Fix table outputter opts 2017-02-13 13:09:10 +00:00
Daniel Hobley
3a3ef25b51 Fix add beacon when there are no devices 
- Changed the assumption that having 0 lines means there are no devices, to actually checking there are no devices
 2017-02-13 13:33:52 +01:00
Morgan Willcock
ea6b7ed5af lint fixes 2017-02-13 11:00:01 +00:00
Pedro Algarvio
8e5a31f0d1
Use six.moves.StringIO 2017-02-13 10:18:58 +00:00
Pedro Algarvio
005f21d3b5
Compare against the normalized mode string 2017-02-13 10:18:58 +00:00
Pedro Algarvio
90d5968ebe
Python 3 compatibility 2017-02-13 10:18:58 +00:00
Pedro Algarvio
6b15e31f68
Convert bytes to string under python 3 2017-02-13 10:18:58 +00:00
Pedro Algarvio
c1b5606199
Handle bytes vs strings on the file state module tests 2017-02-13 10:18:57 +00:00
Pedro Algarvio
488a5e5089
Properly handle octal strings under Py3 2017-02-13 10:18:57 +00:00
Pedro Algarvio
26b17fb044
Make sure the minion sync's modules/states/grains/etc when starting 2017-02-13 10:18:57 +00:00
Pedro Algarvio
6e8e98fbf5
Avoid a recursion issue on Py3 when being deep copied 2017-02-13 10:18:57 +00:00
Pedro Algarvio
873ae4b57a
Under Py3, decode what's read, from bytes to strings 2017-02-13 10:18:57 +00:00
Pedro Algarvio
fe1c82ef1d
Under Py3, what we get from .read() is bytes. 
Using `six.b()` in this particular case is all we need to do.
 2017-02-13 10:18:56 +00:00
Pedro Algarvio
c0faa1ff13
Add 'syndic_log_file' to the keys to check 2017-02-13 10:18:56 +00:00
Pedro Algarvio
7b7133ea25
This test case requires root permissions 2017-02-13 10:18:56 +00:00
Pedro Algarvio
6a88d6f085
Only try to create a directory if dirname is not an empty string. 2017-02-13 10:18:56 +00:00
Pedro Algarvio
a878f89d9f
Provide a fallback class in case of import error 2017-02-13 10:18:56 +00:00
Pedro Algarvio
8d581f5c41 Merge pull request #39348 from terminalmage/git_pillar-tests 
Fix some test instability in develop
 2017-02-13 09:23:59 +00:00
Erik Johnson
6ee6874e11 Set time back 1 week instead of up to 36 years in system module tests 
This prevents git_pillar certificate errors. Additionally, sometimes
/dev/rtc becomes unresponsive which leads the ``hwclock --compare``
command to spin indefinitely, ultimately causing the entire test run to
fail. This changeset uses a SIGALRM handler to abort the hwclock command
if no output is seen within 3 seconds and try a second time. If it times
out the second time as well, then an error will be logged but it will
not be fatal to the test (or hang it indefinitely).
 2017-02-12 23:57:28 -06:00
Erik Johnson
145f6fa786 Make log message more readable 2017-02-12 22:25:02 -06:00
Erik Johnson
ccfcf6867f Fix cwd for cleaning refs 2017-02-12 22:25:02 -06:00
Erik Johnson
64d1c19c0e Handle per-remote and global key types in enforce_types 2017-02-12 22:25:02 -06:00
Erik Johnson
4e577e697d Switch to non-legacy git_pillar syntax in test suite 2017-02-12 15:12:49 -06:00
markuskramerIgitt
b65f5fef49 Removing unused msi_conformant_version_assert() 2017-02-12 16:19:21 +01:00
markuskramerIgitt
8f2b7538a5 Using __saltstack_version__, thanks to @s0undt3ch 2017-02-12 16:08:27 +01:00
Pedro Algarvio
4f8edc36a2 Merge pull request #39340 from terminalmage/issue39334 
Fix gpg renderer breakage from bef5e66
 2017-02-12 12:20:31 +00:00
Erik Johnson
6653d98c5a Fix gpg renderer breakage from bef5e66 
bef5e66 sought to make a PY3 compatibility change, but the attribute
from Python2's cStringIO module is not available via the "fake"
cStringIO which six exposes, as six's cStringIO is just the
cStringIO.StringIO function. The other cStringIO class attributes are
not available via six.

This commit adds a new module with a few functions to get information on
StringIO objects both in Python2 and 3, and modifies the files edited in
bef5e66 to use this new module to determine if the object is a readable
StringIO.

Fixes #39334.
 2017-02-12 01:24:09 -06:00
stein
e80a29e058 repair name error 2017-02-12 10:43:29 +08:00
Morgan Willcock
c4a85c73aa Suggest use of shutdown states in-place of the shutdown modules 2017-02-11 21:22:27 +00:00
Morgan Willcock
6f1699d062 Add reboot and shutdown states to win_system 2017-02-11 20:56:53 +00:00