Commit Graph

36407 Commits

Author SHA1 Message Date
Thomas Jackson
52d0df376f Redundant check
sorted(dict) == sorted(dict.keys())
2014-11-03 15:51:11 -08:00
Thomas Jackson
5930bbdaae Utils/wheel cleanup of dicts 2014-11-03 15:51:10 -08:00
Thomas Jackson
2bb27d3d4b More dict cleanup in state/states 2014-11-03 15:51:10 -08:00
Thomas Jackson
8e02c08a92 keys() cleanup in returners 2014-11-03 15:51:10 -08:00
Thomas Jackson
7821b2d390 Keys() cleanup in renderers 2014-11-03 15:51:10 -08:00
Thomas Jackson
1615c0f394 Cleanup pillar modules with dicts 2014-11-03 15:51:10 -08:00
Thomas Jackson
d686479f54 more cleanup
no need to caste keys() to a list since it returns a list
2014-11-03 15:51:10 -08:00
Thomas Jackson
1ef0b85ff5 Remove redundant keys() since dict is an iterator of keys 2014-11-03 15:51:10 -08:00
Thomas Jackson
1d4444d2f7 More dict cleanup 2014-11-03 15:51:10 -08:00
Thomas Jackson
847659b424 more dict cleanup 2014-11-03 15:51:10 -08:00
Thomas Jackson
6f3f3226b9 More keys() removal 2014-11-03 15:51:10 -08:00
Thomas Jackson
fbc14beb97 No need to create a copy of the keys 2014-11-03 15:51:10 -08:00
Thomas Jackson
3d871c97c2 No reason to create a copy of the dict in memory, we can just get the key from the key iterator 2014-11-03 15:50:55 -08:00
Thomas Jackson
152154df57 Don't need keys() dicts are iterators of their keys 2014-11-03 15:50:54 -08:00
Thomas Jackson
27b5bbe1c1 Dicts are already iterators over their keys 2014-11-03 15:50:54 -08:00
Thomas S Hatch
0bbe01b2f0 Merge pull request #16937 from terminalmage/issue16285
Force VCS fileserver backend config values to be loaded as strings
2014-11-03 16:30:40 -07:00
Thomas S Hatch
072ec7997f Merge pull request #16393 from s0undt3ch/features/ssh-packaging
READ BEFORE MERGE
2014-11-03 14:47:39 -07:00
Pedro Algarvio
58f3575fce Merge pull request #17084 from terminalmage/docs
Update RC version in docs sidebar
2014-11-02 09:08:24 +00:00
Erik Johnson
dfc10ef9b6 Update RC version in docs sidebar 2014-10-31 19:34:03 -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
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
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
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
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
Pedro Algarvio
8e00178a88 Merge pull request #17049 from terminalmage/quickfix
Fix nonsense language in error message
2014-10-31 04:13:26 +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
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
Thomas Jackson
5cf110b80c Fix for #17051 2014-10-30 16:03:00 -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
Erik Johnson
3e2891454e Fix nonsense language in error message 2014-10-30 15:00:50 -06: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
Erik Johnson
1cee8978c8 Use salt.utils.is_darwin() for __virtual__ in osxdesktop module 2014-10-30 14:07:23 -06:00
Nicole Thomas
e20ad37dac Merge pull request #17045 from rallytime/fix_pylint
Remove extra lines
2014-10-30 14:01:42 -06:00
rallytime
705494fedb Remove extra lines 2014-10-30 13:49:02 -06:00
Joseph Hall
6f460f98d6 Merge pull request #17043 from garethgreenaway/16929_2014_7
Minor fix to smtp module
2014-10-30 12:38:55 -06:00
Thomas Jackson
97329d5572 Nicer error message on service state when you watch enable/disable 2014-10-30 11:38:30 -07:00
Gareth J. Greenaway
160003e749 Clarifying documention for smtp module. 2014-10-30 11:27:46 -07:00
Nicole Thomas
cea2f57f55 Merge pull request #17039 from terminalmage/issue17017
Fix state.sls_id
2014-10-30 11:37:31 -06:00