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
53,891 Commits 24 Branches 182 Tags 341 MiB
bf2eddc839
Commit Graph

53891 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colton Myers
bf2eddc839 Merge pull request #24224 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-05-29 16:26:53 -06:00
Colton Myers
90cb448910 Fix rest of rabbitmq tests 2015-05-29 15:11:25 -06:00
Colton Myers
7736509c6b Fix rabbitmq test 2015-05-29 15:11:19 -06:00
Colton Myers
22837e4489 Add six back in and use it for new code 2015-05-29 15:11:11 -06:00
Colton Myers
6b1c1c6faf Remove unused import 2015-05-29 15:11:04 -06:00
Colton Myers
c4f5e231fa Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop2 
Conflicts:
    doc/_themes/saltstack2/layout.html
    doc/conf.py
    doc/index.rst
    doc/ref/modules/all/salt.modules.hipchat.rst
    doc/topics/releases/index.rst
    salt/client/ssh/client.py
    salt/cloud/clouds/vsphere.py
    salt/modules/boto_dynamodb.py
    salt/modules/boto_route53.py
    salt/modules/data.py
    salt/modules/http.py
    salt/modules/tls.py
    salt/output/compact.py
    salt/states/boto_elb.py
    salt/states/linux_acl.py
    salt/states/rabbitmq_user.py
    salt/states/win_servermanager.py
    salt/utils/dictupdate.py
    salt/wheel/config.py
 2015-05-29 15:10:13 -06:00
Shane Lee
a95982c722 Merge pull request #24245 from Sacro/patch-2 
This does indeed change the PythonPath just for the service without affecting environment variables for the rest of the system. Thanks for the fix.
 2015-05-29 14:00:31 -06:00
Nicole Thomas
28dc62cd08 Merge pull request #24248 from msteed/issue-24176 
Reinit pycrypto RNG in Cloud multiprocess paths
 2015-05-29 12:27:09 -06:00
Seth House
f1f90a2ec6 Merge pull request #24230 from aneeshusa/add-serializers 
Add serializers as a new module type
 2015-05-29 11:14:11 -06:00
Michael Steed
311201373b Reinit pycrypto RNG in Cloud multiprocess paths 
run_parallel_map_providers_query() was already covered, but
Cloud.run_map() Cloud.run.destroy() were not
 2015-05-29 11:01:34 -06:00
Thomas S Hatch
1504c76d3a Merge pull request #24121 from hvnsweeting/rabbitmq-host-deprecate-set-permission 
deprecate setting user permission in rabbitmq_vhost.present
 2015-05-29 09:55:40 -06:00
Thomas S Hatch
ad1c5a2606 Merge pull request #24182 from rfairburn/boto_route53_splitdns 
Support split_dns on route53
 2015-05-29 09:53:55 -06:00
Thomas S Hatch
5562b6fa98 Merge pull request #24168 from The-Loeki/patch-2 
Improvements to data module; behave much more like a dict
 2015-05-29 09:53:09 -06:00
Thomas S Hatch
ba02f6509e Merge pull request #24179 from Precis/fix-file-uid-gid-2015.0 
Changing user and group only possible for existing ids.
 2015-05-29 09:52:43 -06:00
Thomas S Hatch
8ff8bb2f92 Merge pull request #24228 from aneeshusa/print-host-name-with-summary 
Print the host name with the highstate summary.
 2015-05-29 09:05:08 -06:00
Thomas S Hatch
9bfb066c2c Merge pull request #24229 from msteed/issue-24147 
Fix auth failure on syndic with external_auth
 2015-05-29 09:04:06 -06:00
Ben Woodward
6632d06e94 Unset PYTHONHOME when starting the service 
Means that installing Python on the system shouldn't break Salt
 2015-05-29 15:28:35 +01:00
Justin Findlay
d957134add Merge pull request #24244 from vladislav-jomedia/develop 
m_names variable added to module.run
 2015-05-29 08:23:43 -06:00
Justin Findlay
b1042353a1 Merge pull request #24242 from travishegner/develop 
Adding hostname to highstate summary output
 2015-05-29 08:21:33 -06:00
Justin Findlay
19fa43c290 Merge pull request #24234 from jayeshka/quota-states-unit-test 
adding states/quota unit test case.
 2015-05-29 08:14:27 -06:00
Your Name
eb34c39e93 m_names variable added to module.run func so now it is possible to run cloud.create module and others who use the names var instead of name, example is in header 2015-05-29 09:11:35 -04:00
Your Name
0532fd5d2a m_names variable added to module.run func so now it is possible to run cloud.create module and others who use the names var instead of name 2015-05-29 09:02:36 -04:00
Travis Hegner
6620e2088f adding the hostname to the summary in the proper way now 2015-05-29 08:32:04 -04:00
Jayesh Kariya
c23356500b adding states/quota unit test case. 2015-05-29 13:19:33 +05:30
Nicole Thomas
1b306c5849 Merge pull request #24221 from rallytime/fix_python26_boto_util_error 
Add SyntaxError to get_error exception
 2015-05-28 21:10:00 -06:00
Nicole Thomas
e15142c629 Merge pull request #24217 from jfindlay/disable_bad_tests 
disable intermittently failing tests
 2015-05-28 21:08:39 -06:00
Nicole Thomas
decb2861de Merge pull request #24220 from djcrabhat/develop 
adding key_filename param to vsphere provider
 2015-05-28 21:06:58 -06:00
Nicole Thomas
ce8e43b774 Merge pull request #24199 from lyft/route53-fix-elb 
Various fixes for boto_route53 and boto_elb
 2015-05-28 21:02:41 -06:00
Nicole Thomas
a43465d235 Merge pull request #24142 from basepi/dictupdate24097 
Optimize dictupdate.update and add #24097 functionality
 2015-05-28 21:00:56 -06:00
Aneesh Agrawal
82a4794e0f Do not reference serializers from aggregation docs. 2015-05-28 20:04:20 -04:00
Aneesh Agrawal
4b9311507c Add new module type for serializers from issue #22257. 
Move existing serializers from salt.utils.serializers to
salt.serializers.
 2015-05-28 20:03:11 -04:00
Ryan Lane
d8dc9a7b5b Better unit tests for boto_elb state 2015-05-28 16:52:24 -07:00
Michael Steed
482d1cfc64 Fix auth failure on syndic with external_auth 
This is totally @thatch45's fix, but if it's broken it's probably my
fault.  Refs #24147.
 2015-05-28 17:32:09 -06:00
Colton Myers
5c6e210c8b Deepcopy on merge_recurse 2015-05-28 17:27:48 -06:00
Aneesh Agrawal
77af6467f4 Print the host name with the highstate summary. 
If there are failed states or unexpected results, this saves having
to scroll all the way to the top of the highstate output to see which
host encountered errors.
 2015-05-28 19:13:16 -04:00
Thomas S Hatch
526698ba8d Merge pull request #24208 from jayeshka/ports-states-unit-test 
adding states/ports unit test case.
 2015-05-28 17:06:33 -06:00
Colton Myers
a13c84ade8 Fix None check from #21968 2015-05-28 16:59:58 -06:00
Justin Findlay
6b6280442c disable intermittently failing tests 
This commit is to be reverted when #23623 is merged.
 2015-05-28 16:23:57 -06:00
Nicole Thomas
d00945fd40 Merge pull request #24219 from jfindlay/zfs_check 
find zfs without modinfo
 2015-05-28 15:07:26 -06:00
rallytime
1f8190b6be Add SyntaxError to get_error exception 
Python2.6 throws a SyntaxError here instead of an AttributeError like Python 2.7 does
 2015-05-28 14:33:30 -06:00
Manoli Yiannakakis
bed2af7c84 adding key_filename param to vsphere provider 2015-05-28 13:18:12 -07:00
Justin Findlay
4e61c4312a Merge pull request #24218 from jimjh/add-delete-policies 
Add a `delete_policies` argument to `boto_iam_role.present`
 2015-05-28 14:15:12 -06:00
Thomas S Hatch
3dc4b85295 Merge pull request #24190 from msteed/issue-23815 
Fix issue 23815
 2015-05-28 14:10:34 -06:00
Justin Findlay
15d401907c use the salt loader in the zfs mod 2015-05-28 13:58:13 -06:00
Justin Findlay
5599b67a46 try to search for zfs if modinfo is unavailable 
Fixes #20635.
 2015-05-28 13:55:24 -06:00
Travis Hegner
1310b6b9ee adding hostname to summary of highstate output 2015-05-28 15:34:42 -04:00
J. Lim
da93f8566c add delete_policies arg 2015-05-28 11:49:15 -07:00
Justin Findlay
436634b508 Merge pull request #24211 from rallytime/bp-24205 
Backport #24205 to 2015.5
 2015-05-28 12:28:15 -06:00
Justin Findlay
cc58624c7e Merge pull request #24212 from terminalmage/clarify-error-msg 
Clarify error in rendering template for top file
 2015-05-28 12:26:19 -06:00
Justin Findlay
9825160b1a Merge pull request #24213 from The-Loeki/patch-3 
ShouldFix _- troubles in debian_ip
 2015-05-28 12:24:39 -06:00