valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
34,313 Commits 24 Branches 182 Tags 341 MiB
0577b4070b
Commit Graph

34313 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
5986702d9b Avoid error in pip uninstall 
Closes #14295
 2014-07-21 13:50:32 -06:00
Thomas S Hatch
518c54a5a6 Merge pull request #14345 from makinacorpus/2014.7 
Fix critical filelist infinite loop race
 2014-07-21 10:06:19 -06:00
Thomas S Hatch
14f4d4516b Merge pull request #14290 from mgwilliams/lxc-check-seed 
avoid using test.ping on a non-existent minion
 2014-07-21 09:43:37 -06:00
Pedro Algarvio
3df3c722d0 Merge pull request #14361 from pass-by-value/remove_config_references2 
Remove references to deprecated config options
 2014-07-21 16:09:31 +01:00
Aditya Kulkarni
7e6015fffa Remove references to deprecated config options 2014-07-21 10:41:45 -04:00
Erik Johnson
fa24e3c7fe Fix paths in proxyminion example 
Default pillar root is /srv/pillar, not /srv/salt/pillar.
 2014-07-20 18:34:13 -05:00
Pedro Algarvio
d4a66c62b3 Merge pull request #14350 from terminalmage/issue14322 
Fix unused arguments in S3 external pillar
 2014-07-20 02:24:47 +01:00
Erik Johnson
4178a6770b Fix unused arguments in S3 external pillar 2014-07-19 18:24:59 -05:00
Pedro Algarvio
10c1dba504 Merge pull request #14347 from s0undt3ch/2014.7 
[Cherrypick from develop] Pylint caller.py
 2014-07-19 20:09:06 +01:00
Pedro Algarvio
2f79afb8f4 "Hide" contextmanager and depends from salt's loader 2014-07-19 20:04:45 +01:00
Pedro Algarvio
a2f644d59b Merge pull request #14344 from terminalmage/issue14261 
Don't try to look in nonexistant backup dir
 2014-07-19 17:22:14 +01:00
Mike Place
164b193526 Pylint caller.py 2014-07-19 13:01:32 +01:00
Pedro Algarvio
55298c39b1 Merge pull request #14332 from rallytime/cloud_deprecations 
Cloud deprecations for Helium
 2014-07-19 01:05:45 +01:00
Erik Johnson
ac3d5dca06 Don't try to look in nonexistant backup dir 2014-07-18 17:17:04 -05:00
Mathieu Le Marec - Pasquet
58bf9f5d1a Fix critical filelist infinite loop race 2014-07-19 00:14:18 +02:00
Pedro Algarvio
b6827883e7 Merge pull request #14342 from rallytime/fix_unused_boto_kwargs 
Removed unused kwarg in boto_elasticache.present
 2014-07-18 18:41:20 +01:00
rallytime
b52da21b79 Removed unused kwarg in boto_elasticache.present 2014-07-18 11:13:13 -06:00
rallytime
c70c8ee5aa Remove cloud_config tests for deprecated arguments 2014-07-17 16:41:11 -06:00
rallytime
ba17a3d64e Remove CloudConfigMixIn class from salt/utils/parsers (deprecated) 2014-07-17 16:35:25 -06:00
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