valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
54,183 Commits 24 Branches 182 Tags 341 MiB
a9a38a20b1
Commit Graph

54183 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jerzy Drozdz
9eb9892516 Changed return values and assertions to lists 2015-05-30 01:03:43 +02:00
Thomas S Hatch
a28515aa2c Merge pull request #23060 from makinacorpus/service 
ubuntu systemd/legacy init support
 2015-05-29 17:02:08 -06:00
Thomas S Hatch
b07e60621b Merge pull request #24007 from garethgreenaway/beacon_state_module 
Adding a state module to manage beacons
 2015-05-29 17:00:22 -06:00
Thomas S Hatch
41ada361ce Merge pull request #24103 from makinacorpus/profiling 
Profiling
 2015-05-29 16:59:49 -06:00
Thomas S Hatch
48ba667337 Merge pull request #24223 from twangboy/win_wua_module 
Added module win_wua.py for managing windows updates
 2015-05-29 16:58:37 -06:00
Thomas S Hatch
fd91e22f7b Merge pull request #24249 from cedwards/pillar_item_patch 
patch pillar.item to support nested pillar
 2015-05-29 16:58:12 -06:00
Thomas S Hatch
195167ef83 Merge pull request #23837 from cedwards/ats_state 
Initial Traffic Server state module
 2015-05-29 16:57:27 -06:00
Colton Myers
08a10755b3 Merge pull request #24260 from basepi/lxctypos24080 
Fix some typos from #24080
 2015-05-29 16:54:58 -06:00
Colton Myers
0fa1ad3977 Fix another lxc typo 2015-05-29 16:54:06 -06:00
Colton Myers
669938f28d s/you ll/you'll/ 2015-05-29 16:53:37 -06:00
Colton Myers
75590cf490 Merge pull request #24080 from makinacorpus/lxc_consistency2 
Lxc consistency2
 2015-05-29 16:51:54 -06:00
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
Jerzy Drozdz
e564a0b473 Added setting of __grains__['osrelease'] in test 2015-05-30 00:16:25 +02:00
Justin Findlay
9508924c02 fix pkg mod integration test on ubuntu 12.04 2015-05-29 15:52:57 -06:00
Justin Findlay
da14f3b976 Merge pull request #24247 from rallytime/bp-24220 
Backport #24220 to 2015.5
 2015-05-29 15:40:01 -06:00
Justin Findlay
21d6126c34 Merge pull request #24254 from rallytime/add_deprecation_warning_digitalocean 
Add deprecation warning to Digital Ocean v1 Driver
 2015-05-29 15:39:25 -06:00
Justin Findlay
dac055dd8b Merge pull request #24252 from aboe76/opensuse_package 
Updated suse spec to 2015.5.1
 2015-05-29 15:38:45 -06:00
Justin Findlay
49e7fe8a5e Merge pull request #24251 from garethgreenaway/2015_5_returner_brokenness 
Returners broken in 2015.5
 2015-05-29 15:37:51 -06:00
Joseph Hall
bfb946123e Merge pull request #24255 from rallytime/clarify_digital_ocean_driver_docs 
Clarify digital ocean documentation and mention v1 driver deprecation
 2015-05-29 15:37:07 -06:00
Justin Findlay
41f5756f36 Merge pull request #24232 from rallytime/bp-23308 
Backport #23308 to 2015.5
 2015-05-29 15:36:46 -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
Jerzy Drozdz
15ef09504e FIX: pylint errors 2015-05-29 22:50:29 +02:00
rallytime
095979d0c2 Add digitalocean deprecation notice to Beryllium release notes 2015-05-29 14:50:22 -06:00
rallytime
c10453e844 Deprecate digital_ocean.py in favor of digital_ocean_v2.py 
The removes support for the original digital_ocean.py driver in salt-cloud
and replaces the original digital_ocean.py driver with the digital_ocean_v2.py
driver. The digital_ocean_v2.py driver is renamed to just digital_ocean.py.
 2015-05-29 14:32:42 -06:00
rallytime
8d51f75aa5 Clarify digital ocean documentation and mention v1 driver deprecation 
Fixes #21498
 2015-05-29 14:14:19 -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
rallytime
cafe37bdf8 Add note to docs about deprecation 2015-05-29 13:20:02 -06:00
rallytime
ea0f1e0921 Add deprecation warning to digital ocean driver to move to digital_ocean_v2 
Digital Ocean's APIv1 is deprecated and will no longer be available starting Nov. 1, 2015.

In Salt Beryllium, the digital_ocean_v2.py driver, which uses Digital Ocean's AIPv2, will
become digital_ocean.py.
 2015-05-29 12:53:50 -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
Niels Abspoel
0ad617df21 Updated suse spec to 2015.5.1 2015-05-29 20:26:31 +02:00
twangboy
d0aa681b75 Pylint V: PyCharm's Revenge 2015-05-29 12:26:00 -06:00
Gareth J. Greenaway
5df6b52568 The code calling cfg as a function vs treating it as a dictionary and using get is currently backwards causing returners to fail when used from the CLI and in scheduled jobs. 2015-05-29 11:16:44 -07:00
twangboy
ab940a466c Even more pylint fixes... will there be a sequel? 2015-05-29 11:26:17 -06:00
Christer Edwards
aa34848ae5 patch pillar.item to support nested pillar 2015-05-29 11:19:14 -06:00
Edouard Bonlieu
884c9bc8e2 Rework comments 2015-05-29 19:18:04 +02: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
Julien Castets
79a638d625 Add comments 2015-05-29 19:01:26 +02:00
Julien Castets
1ce8b4ccde Rework array building with oneliner 2015-05-29 19:01:26 +02:00
Julien Castets
920f12ee28 Use Python best practices 2015-05-29 19:01:26 +02:00
Julien Castets
4edd7df9e9 s/while <var>/for var in range()/ 2015-05-29 19:01:26 +02:00
Julien Castets
40c68c0863 Remove use of HAS_REQUESTS 2015-05-29 18:44:38 +02:00
Julien Castets
d401ad2f64 Change api.cloud.online.net to api.scaleway.com 
This will raise an error when using the Python 2 of OSX because it
doesn't support SNI. However, most of users use the Python of homebrew.

See https://stackoverflow.com/questions/18578439/using-requests-with-tls-doesnt-give-sni-support/18579484#18579484
 2015-05-29 18:44:38 +02:00
Julien Castets
ed4bed51d3 PEP8 fixes 2015-05-29 18:44:38 +02:00
Manoli Yiannakakis
0b1041dd72 adding key_filename param to vsphere provider 2015-05-29 10:28:36 -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