Commit Graph

39288 Commits

Author SHA1 Message Date
Thomas S Hatch
b434928e01 Merge pull request #17112 from sbworth/templates-sls-double-fix
Remove doubled up code for adding slspath variants to template context
2014-11-03 21:01:25 -07:00
Thomas S Hatch
30af132629 lint 2014-11-03 20:59:28 -07:00
Thomas S Hatch
e5900e5bcc Merge branch 'salt-xfs' of https://github.com/isbm/salt into isbm-salt-xfs 2014-11-03 20:53:37 -07:00
Thomas S Hatch
d10f440155 Merge branch 'jacksontj-develop' into develop 2014-11-03 20:50:06 -07:00
Thomas S Hatch
566d4c0f28 lint 2014-11-03 20:49:50 -07:00
Thomas S Hatch
1b07eab579 Merge branch 'develop' of https://github.com/jacksontj/salt into jacksontj-develop 2014-11-03 20:49:16 -07:00
Thomas S Hatch
c6326394c6 Merge pull request #17106 from mgwilliams/loader
add function to loader for loading utility modules (_utils)
2014-11-03 20:45:19 -07:00
Thomas S Hatch
715c434c2f Merge pull request #17104 from avdhoot/fix_#16085
Fix #16085 pam auth module was not closeing PamHandle hence there was memory leak.
2014-11-03 20:43:36 -07:00
Thomas S Hatch
9a96ed63f7 Merge pull request #17102 from rominf/parted-tests
Actually testing parted
2014-11-03 20:42:49 -07:00
Thomas S Hatch
87e9db4de8 Merge pull request #17098 from mgwilliams/ret_config
fix returner config bug
2014-11-03 20:41:41 -07:00
Thomas S Hatch
74edf77b8a Merge pull request #17129 from saltstack/revert-17093-returner-overwrites-attrs
Revert "salt.returners.get_returner_options attributes are always overwr...
2014-11-03 20:40:58 -07:00
Thomas S Hatch
27d4c74b1b Revert "salt.returners.get_returner_options attributes are always overwritten with a blank dictionary" 2014-11-03 20:40:50 -07:00
Thomas S Hatch
737779ea2e Merge pull request #17093 from dmyerscough/returner-overwrites-attrs
salt.returners.get_returner_options attributes are always overwritten with a blank dictionary
2014-11-03 20:39:38 -07:00
Thomas S Hatch
5b7fd54a0e Merge pull request #17091 from garethgreenaway/network_routes
Adding network.route and network.default_route functions to network module.
2014-11-03 20:33:57 -07:00
Thomas S Hatch
1bcedaaada Merge pull request #17087 from umireon/dockerio-nsenter-erroneously-take-option
module/dockerio: Separate nsenter argument and command
2014-11-03 20:32:57 -07:00
Thomas S Hatch
01c1d7347a Merge pull request #17080 from jacksontj/2014.7
2014.7: misc dict usage cleanup
2014-11-03 20:31:03 -07:00
Thomas S Hatch
ae6642a909 lint 2014-11-03 20:29:35 -07:00
Thomas S Hatch
1cdd18fbb3 Merge branch 'drbd' of https://github.com/ror6ax/salt into ror6ax-drbd 2014-11-03 20:27:09 -07:00
Thomas S Hatch
0b9831f672 Merge pull request #17127 from thatch45/win_faq
Add comment to clarify confusion in faqs
2014-11-03 20:25:35 -07:00
Thomas S Hatch
bc7217c331 Add comment to clarify confusion in faqs 2014-11-03 20:24:44 -07:00
Thomas S Hatch
d0dbb7c76a Merge pull request #16996 from AccelerationNet/win-service-stop-reliably
Win service stop reliably
2014-11-03 20:22:56 -07:00
Joseph Hall
7707eb66b4 Merge pull request #17099 from mgwilliams/memcache_return
fix memcache_return
2014-11-03 20:22:24 -07:00
Thomas S Hatch
bc62a9ff7b Merge pull request #16988 from lomeroe/fix-win_groupadd
Added 'adduser', 'deluser', and 'members' functions.  Changed all code t...
2014-11-03 20:21:43 -07:00
Thomas S Hatch
b461505a73 Merge pull request #16905 from thatch45/state_req
Add the ability to set state requests
2014-11-03 20:17:58 -07:00
Thomas S Hatch
e98e77c6ed Merge pull request #17123 from rallytime/revert_16861
Revert PR #16861
2014-11-03 20:17:19 -07:00
Damian Myerscough
94d277f897 YubiKey Authentication 2014-11-03 18:33:02 -08:00
Matthew Williams
e726dcf01f fix lint for memcache returner 2014-11-04 02:27:24 +00:00
rallytime
5b2cb4fb8f Revert "Add test.assertion"
This reverts commit b178a55864.

Conflicts:
	salt/modules/test.py
2014-11-03 17:50:26 -07:00
Thomas S Hatch
bc5e6f5822 lint and cli example for request 2014-11-03 16:52:42 -07:00
Thomas Jackson
ce01b7bbc6 Change IndexError to StopIteration 2014-11-03 15:51:11 -08:00
Thomas Jackson
74067e15e4 Change IndexError to StopIteration 2014-11-03 15:51:11 -08:00
Thomas Jackson
fe1266e02a Change from indexerror to stopiteration 2014-11-03 15:51:11 -08:00
Thomas Jackson
df92546948 Another pylint fix 2014-11-03 15:51:11 -08:00
Thomas Jackson
0f971412fd Fix typo 2014-11-03 15:51:11 -08:00
Thomas Jackson
b4afb8ce43 More dict cleanup
keys() and values() create copies of the data in lists, iterators are better
2014-11-03 15:51:11 -08:00
Thomas Jackson
0a1b494d2d More dict cleanup
keys() and values() create copies of the data in lists, iterators are better
2014-11-03 15:51:11 -08:00
Thomas Jackson
a650a5d9e8 More dict cleanup
keys() and values() create copies of the data in lists, iterators are better
2014-11-03 15:51:11 -08:00
Thomas Jackson
c4af0fcef1 More dict cleanup
keys() and values() create copies of the data in lists, iterators are better
2014-11-03 15:51:11 -08:00
Thomas Jackson
d81bca7aa7 More dict cleanup
keys() and values() create copies of the data in lists, iterators are better
2014-11-03 15:51:11 -08:00
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