valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
39,057 Commits 24 Branches 182 Tags 341 MiB
0cc0d64136
Commit Graph

39057 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colton Myers
0cc0d64136 Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/hg.py
 2014-10-31 16:14:34 -06:00
Thomas S Hatch
3e2b366cd6 Merge pull request #17081 from lyft/fix-state-verbose 
Fix state_verbose: False output
 2014-10-31 15:47:40 -06:00
Thomas S Hatch
4f5cff68a8 Merge pull request #17078 from dmyerscough/drac-network-state 
DRAC Network State
 2014-10-31 15:44:55 -06:00
Thomas S Hatch
a947047538 Merge pull request #17077 from feth/display_pkg_version 
Display the package version in pkg.latest when a package is up to date
 2014-10-31 15:42:42 -06:00
Thomas S Hatch
1f1f2193fb Merge pull request #17064 from opdude/hg-quotations 
Quotations are not necessary when passing cmd arguments in as an array
 2014-10-31 15:37:39 -06:00
Thomas S Hatch
60f90e2084 Merge pull request #17060 from luckenbach/fix_win_ntp 
Updated win_ntp.py to catch the ValueError that would occur when
 2014-10-31 15:36:54 -06:00
Thomas S Hatch
999777d001 Merge pull request #17052 from hulu/unsafe-default-arg 
utils.error.fire_exception: fix unsafe mutable default argument value
 2014-10-31 15:35:05 -06:00
Thomas S Hatch
b8eda43883 Merge pull request #17046 from jacksontj/develop 
Fix for issue where master comm errors cause minions to delete all modules
 2014-10-31 15:34:38 -06:00
Thomas S Hatch
15a51935fa Merge pull request #17073 from jfindlay/jmoney/linux_sysctl_test 
Jmoney/linux_sysctl_test
 2014-10-31 15:25:35 -06:00
Ryan Lane
53d8304b15 Fix state_verbose: False output 2014-10-31 14:08:20 -07:00
Damian Myerscough
bf454a4afa DRAC Network State 2014-10-31 13:12:27 -07:00
Feth AREZKI
029700e4ab Display the package version in pkg.latest when a package is up to date 
fixes: #16121
 2014-10-31 21:02:05 +01:00
Justin Findlay
26094b39b4 pylint fix on linux_sysctl_test.py 2014-10-31 12:41:04 -06:00
Justin Findlay
f09b8e3873 remove redundant mock_open() in darwin_sysctl_test.py 2014-10-31 10:42:57 -06:00
Justin Findlay
31f2dbaa91 change linux_sysctl.py to fail properly on misassign 
The original check (4e1c367) for sysctl assign failure queries the
format returned by sysctl on stdout.  It was added evidently for some
container system called Virtuozzo.  A later commit (4e1c367) strengthens
the check into a full regex on sysctl stdout.

Unfortunately, it appears that on a contemporary conventional distro,
CentOS 7, sysctl repeats the config it is given on stdout whether or not
the config requested is valid.  Furthermore, an invalid config request
will not cause sysctl to return a nonzero status.  It does print an
error on stderr, so I've added an optional additional check of stderr.
Examples:

centos-7 # sysctl net.ipv4.ip_forward=1 ; echo $?
net.ipv4.ip_forward = 1
0

centos-7 # sysctl net.ipv4.ip_forward=backward ; echo $?
sysctl: setting key "net.ipv4.ip_forward": Invalid argument
net.ipv4.ip_forward = backward
0
 2014-10-31 10:25:24 -06:00
Justin Findlay
106f645c9e adding tests for modules/linux_sysctl.py 2014-10-31 10:16:41 -06:00
Nicole Thomas
573390d8ad Merge pull request #17054 from jacksontj/2014.7 
Fix for #17051
 2014-10-31 10:14:16 -06:00
Joseph Hall
7afb06d332 Merge pull request #17071 from steverweber/develop 
removed unused place holder
 2014-10-31 09:25:21 -06:00
Steve Weber
f8556451e5 removed unused place holder 
removed unused string place holder
 2014-10-31 11:22:25 -04:00
Nicole Thomas
febd925453 Merge pull request #17069 from cachedout/issue_17055 
Fix failing tests
 2014-10-31 09:16:55 -06:00
Mike Place
a0a0512cf5 Fix failing tests 2014-10-31 08:35:23 -06:00
Daniel Hobley
3edf142290 Quotations are not necessary when passing cmd arguments in as an array 
- This also fixes the inability to clone mercurial repos on Ubuntu 12.04
 2014-10-31 13:49:13 +01:00
Zach Hilliard
1afe234042 Updated win_ntp.py to catch the ValueError that would occur when 
a windows machine is attached to a domain and not using NTP for
time
 2014-10-31 00:56:18 -05:00
Pedro Algarvio
8e00178a88 Merge pull request #17049 from terminalmage/quickfix 
Fix nonsense language in error message
 2014-10-31 04:13:26 +00:00
Pedro Algarvio
543b2d5dc7 Merge pull request #17053 from hulu/assertion-shadowing 
avoid shadowing in salt.modules.test.assertion
 2014-10-31 04:12:14 +00:00
C. R. Oldham
d44a4739c7 Merge pull request #17059 from cro/nssm_update 
Update nssm to latest 2.24 (2014-08-31 release)
 2014-10-30 22:16:47 -04:00
C. R. Oldham
6c9be002c5 Update nssm to 2.24 2014-10-30 22:15:26 -04:00
Samuel Smith
06ba3ab1d7 Merge pull request #17058 from SmithSamuelM/sam_dev1 
Better support (but not complete) for Mult-Masters on Salt Raet
 2014-10-30 19:11:38 -06:00
Samuel M Smith
99f02b1424 Merge remote-tracking branch 'upstream/develop' into sam_dev1 2014-10-30 19:06:16 -06:00
Samuel M Smith
4dbd303300 Reinstate salt-call RAETChannel dst 2014-10-30 18:50:47 -06:00
Samuel M Smith
ec227845f9 Revert salt-call usage change for RAETChannel as it didn't fix completely and normal targeting was wonky 2014-10-30 18:32:41 -06:00
Samuel M Smith
91c5b613a0 salt-call usage of RaetChannel also needs to go to master that motivated the call 
Fixed
 2014-10-30 18:23:17 -06:00
Colton Myers
8237ae6b19 Merge pull request #17057 from basepi/mergeforward 
Merge 2014.7 into develop
 2014-10-30 18:17:10 -06:00
Colton Myers
f38491ba8c Unsafe argument 2014-10-30 18:15:42 -06:00
Thomas Jackson
6262d44d50 Add "normalize_ret" function, so we don't have to copy/paste so much 
Add checks for "changes" since we want to test cases where there aren't changes to be made
 2014-10-30 16:58:03 -07:00
Thomas Jackson
d2b548a0e7 Add regression test for #17051 2014-10-30 16:43:06 -07:00
Colton Myers
f625c21d77 Merge branch '2014.7' into mergeforward 
Conflicts:
	salt/cloud/clouds/ec2.py
	salt/daemons/flo/worker.flo
	salt/master.py
	salt/minion.py
	salt/modules/lxc.py
	salt/states/win_update.py
	salt/states/zk_concurrency.py
 2014-10-30 17:42:36 -06:00
Thomas Jackson
5cf110b80c Fix for #17051 2014-10-30 16:03:00 -07:00
Chris Rebert
be6b731885 avoid shadowing in salt.modules.test.assertion 2014-10-30 15:42:14 -07:00
Chris Rebert
867779df23 utils.error.fire_exception: fix unsafe mutable default argument value 
************* Module salt.utils.error
salt/utils/error.py:44: [W0102(dangerous-default-value), fire_exception] Dangerous default value {} as argument
 2014-10-30 15:36:16 -07:00
Colton Myers
2fec4d01d6 Merge pull request #17048 from terminalmage/osxdestkop-virtual 
Use salt.utils.is_darwin() for __virtual__ in osxdesktop module
 2014-10-30 16:17:55 -06:00
Erik Johnson
90258b6ecf don't load on windows 2014-10-30 15:43:15 -06:00
Erik Johnson
5a84887c4c add virtual function 2014-10-30 15:42:55 -06:00
Erik Johnson
8d2d885f62 reword docstring 2014-10-30 15:02:30 -06:00
Thomas Jackson
1c07eda1ba Fix typo 2014-10-30 14:02:21 -07:00
Erik Johnson
3e2891454e Fix nonsense language in error message 2014-10-30 15:00:50 -06:00
Thomas Jackson
a87e135c8d Remove unused import 2014-10-30 13:59:42 -07:00
Thomas Jackson
e74424493d Add force option to lock() 2014-10-30 13:58:40 -07:00
Mike Place
5137f3dfb4 Merge pull request #17044 from jacksontj/2014.7 
Nicer error message on service state when you watch enable/disable
 2014-10-30 14:21:25 -06:00
Samuel M Smith
03ebb6326f Added module globals in transport.py for RaetChannel so that in multi-master jobber yard know which master 
initiated job so that it can respond to the correct estate

Fixed typos

Fixed lint errors
 2014-10-30 14:07:48 -06:00