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
rallytime
2733f66449
Import string
2015-05-29 09:54:38 -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
Edouard Bonlieu
c1e63831b2
Added scaleway provider
2015-05-29 15:12:05 +02: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
Jerzy Drozdz
8775906709
Merge remote-tracking branch 'upstream/develop' into develop
2015-05-29 12:28:22 +02:00