Commit Graph

34191 Commits

Author SHA1 Message Date
rallytime
c088a44a56 Deprecate libcloud_version from salt/cloud/libcloudfuncs 2014-07-17 16:30:20 -06:00
rallytime
66592887b7 Remove vm_config and vm_config_path from config.cloud_config function 2014-07-17 16:26:49 -06:00
Thomas S Hatch
513fa3c648 Merge pull request #14330 from thatch45/2014.7
forward merge lxc fixes
2014-07-17 16:04:34 -06:00
Thomas S Hatch
b378dbbe14 Merge branch 'bp-14324' into 2014.7 2014-07-17 16:03:27 -06:00
Matthew Williams
047871501b modules.lxc: don't pass fstype or size for btrfs 2014-07-17 16:01:37 -06:00
Thomas S Hatch
ef277feba1 Merge pull request #14314 from cachedout/grains_raet
Increase timeout for grains test
2014-07-17 15:51:37 -06:00
Thomas S Hatch
5796f88418 Merge pull request #14309 from ticosax/fix-docker-auth-with-pillar
Fix docker auth with pillar
2014-07-17 15:48:38 -06:00
Colton Myers
bafffdc5ad Merge pull request #14325 from whiteinge/salt-fix-missing-pillar-kwarg
Add mising pillar kwarg to saltmod.state
2014-07-17 15:24:09 -06:00
Seth House
7816b87f63 Added missing pillar/test kwarg docs 2014-07-17 15:16:31 -06:00
Seth House
c89659537e Add mising pillar kwarg to saltmod.state 2014-07-17 15:10:43 -06:00
Erik Johnson
860dd09f79 Merge pull request #14303 from rallytime/doc_fix
Make pkg.installed and pkg.latest language more clear
2014-07-17 15:29:36 -05:00
Thomas S Hatch
5a8a5c3485 Merge pull request #14300 from pass-by-value/more_matcher_test_fixes
Ensure tests pass on raet and zmq
2014-07-17 14:19:39 -06:00
Samuel Smith
00e8e84aad Merge pull request #14320 from SmithSamuelM/sam_2014.7
salt-call raet now only uses one yard and cleans up after itself
2014-07-17 14:11:21 -06:00
Samuel M Smith
ea5d4abb9c Merge remote-tracking branch 'upstream/2014.7' into sam_2014.7 2014-07-17 14:04:39 -06:00
Samuel M Smith
8d7223dd0e Support for a single global Yard for each salt-call process so that it is cleaned up when its done 2014-07-17 14:03:10 -06:00
Thomas S Hatch
540261ff27 Merge pull request #14317 from thatch45/2014.7
fix quotes
2014-07-17 13:44:14 -06:00
Thomas S Hatch
b884eca3d9 Merge branch 'fix-lint' into 2014.7 2014-07-17 13:43:42 -06:00
Thomas S Hatch
6caeb7338a Fix quotes 2014-07-17 13:42:21 -06:00
Thomas S Hatch
37b17cc965 Merge pull request #14316 from thatch45/2014.7
backport #14296
2014-07-17 13:41:10 -06:00
Thomas S Hatch
049a4fa091 Merge branch 'bp-14296' into 2014.7 2014-07-17 13:40:27 -06:00
Scott Walton
4195a62681 We don't need to wrap the function calls in which because our _get_rabbitmq_plugin function does the job for us. Removes some imports #14235 2014-07-17 13:40:07 -06:00
Scott Walton
ce0aa21be2 Added a plugin helper that hunts out the rabbitmq-plugins variable on linux systems that don't expose it in the PATH variable #14235 2014-07-17 13:40:07 -06:00
Thomas S Hatch
8e3943c2cf Merge pull request #14315 from thatch45/2014.7
backport #14292
2014-07-17 13:32:00 -06:00
Nicolas Delaby
758c288645 Stop hacking with private property client._auth_configs.
Let docker-py deal with it by using public api client.login()
2014-07-17 21:31:27 +02:00
Thomas S Hatch
dd01f1a413 Merge branch 'bp-14292' into 2014.7 2014-07-17 13:31:10 -06:00
Theodore Cowan
4d692a2eeb Update mongodb_user.py
Fix for issue https://github.com/saltstack/salt/issues/14281
2014-07-17 13:30:49 -06:00
Mike Place
919e9db946 Increase timeout for grains test 2014-07-17 13:27:08 -06:00
Thomas S Hatch
c693d8ed66 Merge pull request #14287 from rallytime/helium_deprecations
Helium deprecations
2014-07-17 13:25:38 -06:00
Thomas S Hatch
d0c1fedcbf Merge pull request #14313 from thatch45/2014.7
Backport #14279
2014-07-17 13:25:06 -06:00
Thomas S Hatch
242c077e2c Merge branch 'bp-14279' into 2014.7 2014-07-17 13:24:18 -06:00
Elias Probst
b240a09b9c Make it more clear what the contents_newline option does.
The current description didn't make it really clear whether
this option is there to preserve newlines in content or just
ensures a final newline.
2014-07-17 13:23:58 -06:00
Thomas S Hatch
a4cb3a1f45 Merge pull request #14312 from thatch45/2014.7
backport #14274
2014-07-17 13:21:18 -06:00
Thomas S Hatch
eb87333fa7 Merge branch 'bp-14274' into 2014.7 2014-07-17 13:18:59 -06:00
Michael Birtwell
dd8f9da26a Add support for state.top function to salt.state state 2014-07-17 13:18:29 -06:00
Thomas S Hatch
9a4a3e8391 Merge pull request #14310 from thatch45/2014.7
backport #14260
2014-07-17 13:01:42 -06:00
Thomas S Hatch
97ee5640e6 Merge branch 'bp-14260' into 2014.7 2014-07-17 12:59:28 -06:00
Colin Johnson
00495de1bb LYFT-14491 - resolve issue with boto_asg.exists 2014-07-17 12:58:58 -06:00
Thomas S Hatch
9ce1ce1694 Merge pull request #14291 from cachedout/parse_input_newline
More aggressive newline catch in args parsing
2014-07-17 12:18:13 -06:00
Nicolas Delaby
7ea08472f8 The ending slash is important 2014-07-17 20:00:52 +02:00
rallytime
1e419366b3 Make pkg.installed and pkg.latest language more clear 2014-07-17 09:41:04 -06:00
Aditya Kulkarni
88a873a171 Ensure tests pass on raet and zmq 2014-07-17 10:32:07 -04:00
Mike Place
7c603224cc More aggressive newline catch in args parsing 2014-07-16 16:10:04 -06:00
Erik Johnson
62d64daf1c Merge pull request #14289 from cachedout/tls_doc
Docs for tls module.
2014-07-16 17:03:50 -05:00
Mike Place
1e77cea548 Docs for tls module. 2014-07-16 15:03:29 -06:00
rallytime
f2b478d6c7 Remove unused import 2014-07-16 14:35:12 -06:00
Thomas S Hatch
7b1e3357a9 Merge pull request #14285 from cachedout/raet_pillar
Don't refresh a pillar to None
2014-07-16 13:55:47 -06:00
Mike Place
b04e2e33a9 Don't refresh a pillar to None 2014-07-16 13:26:11 -06:00
rallytime
fbff31b5f1 Update warn_until deprecation messages for run_as 2014-07-16 13:25:40 -06:00
rallytime
81e06fa252 Removed deprecated functions in salt/modules/ps.py 2014-07-16 12:49:45 -06:00
rallytime
2c61c23e2a Deprecated OutputOptionsWithTextMixIn class from salt/utils/parsers.py 2014-07-16 12:36:31 -06:00