Commit graph

55660 commits

Author SHA1 Message Date
Rafael Uzarowski
54f2bbee1c Fix pylint warnings in cloud/clouds/ec2.py 2015-07-09 10:49:41 +02:00
Justin Findlay
9dbd6d85fb ensure ret is always defined 2015-07-09 01:42:26 -06:00
Joseph Hall
d41068ff61 Merge pull request #25276 from jacobhammons/spm-man-page
copy spm.1 man page during setup
2015-07-08 20:53:17 -06:00
Joseph Hall
e078a6d924 Merge pull request #25278 from rallytime/fix-25228
Don't require size for all cloud drivers when checking profile configs
2015-07-08 20:52:23 -06:00
rallytime
3579709e8b Use a better variable name 2015-07-08 19:48:59 -06:00
rallytime
d60176b396 Don't require size for all cloud drivers when checking profile configs
Fixes #25228
2015-07-08 19:43:31 -06:00
Jacob Hammons
d27ab32d0e copy spm.1 man page during setup
Refs #25213
2015-07-08 19:25:09 -06:00
Seth House
a2f1a56393 Merge pull request #25122 from arthurlogilab/sharedsecretauth
[auth] add sharedsecret auth (closes #25121)
2015-07-08 19:13:05 -06:00
Colton Myers
84ce602469 Merge pull request #25271 from basepi/merge-forward-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2015-07-08 18:59:34 -06:00
Colton Myers
0654ef5a08 Merge pull request #25273 from basepi/merge-forward-develop
Merge forward from 2015.8 to develop
2015-07-08 18:59:28 -06:00
Seth House
635abd5e18 Merge branch 'runner-kwargs' into develop 2015-07-08 17:39:51 -06:00
Colton Myers
a40574850f Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 2015-07-08 16:26:25 -06:00
Colton Myers
3a7289a0cb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    doc/ref/states/all/salt.states.aptpkg.rst
    doc/ref/states/all/salt.states.etcd_mod.rst
    doc/topics/releases/releasecandidate.rst
    salt/client/mixins.py
    salt/modules/win_pkg.py
    tests/unit/modules/boto_vpc_test.py
2015-07-08 16:24:58 -06:00
Nicole Thomas
9e906030a0 Merge pull request #25263 from techhat/nonstandard
Allow non-standard HTTP requests on tornado
2015-07-08 15:27:08 -06:00
Justin Findlay
bba556c6ac win_firewall exec mod optional args in delete_rule 2015-07-08 15:04:49 -06:00
Justin Findlay
36f2af6048 single quote win_firewall exec module 2015-07-08 15:04:49 -06:00
Justin Findlay
fb86a77706 update release codenames 2015-07-08 14:52:14 -06:00
Justin Findlay
beb9715d0e update blockdev tests for deprecation 2015-07-08 14:50:52 -06:00
Nicole Thomas
4e7346aac4 Merge pull request #25253 from s0undt3ch/2015.8
Remove the deprecation warning. The driver has been renamed.
2015-07-08 14:48:31 -06:00
Rafael Uzarowski
2be0b541ae cloud: EC2 Interface property SourceDestCheck is a AttributeBooleanValue (SourceDestCheck.Value=<bool>) at the API 2015-07-08 22:39:17 +02:00
Joseph Hall
ee62c75beb Allow non-standard HTTP requests on tornado 2015-07-08 14:37:50 -06:00
Nicole Thomas
679cdbac69 Merge pull request #25248 from techhat/issue22391
Do not resize while iterating
2015-07-08 13:38:36 -06:00
Peter Tripp
72323fcac9 Document SourceDestCheck added in #25242. 2015-07-08 12:31:36 -07:00
Justin Findlay
ffe3a377e7 replace shell code with native python code 2015-07-08 13:18:39 -06:00
rallytime
1b7efa91e0 Remove references to Beryllium in relevant docs 2015-07-08 11:17:01 -06:00
rallytime
588d4e1b26 More Beryllium references changed to 2015.8.0 2015-07-08 11:11:29 -06:00
Pedro Algarvio
ea7afb49d2 Remove the deprecation warning. The driver has been renamed. 2015-07-08 18:07:49 +01:00
rallytime
b24911a3e1 More Beryllium --> 2015.8.0 version reference changes 2015-07-08 10:57:43 -06:00
Bo Maryniuk
9435cb927b Implement Rsync synchronization state 2015-07-08 18:53:34 +02:00
Bo Maryniuk
a72477f64b Fix docstring for the main method 2015-07-08 18:52:53 +02:00
Bo Maryniuk
e3176df549 Implement Rsync changes extractor 2015-07-08 18:52:14 +02:00
Bo Maryniuk
eab59dd5d6 Implement Rsync summary extractor 2015-07-08 18:51:44 +02:00
Bo Maryniuk
57a8454253 Change the module docstring 2015-07-08 18:50:56 +02:00
Bo Maryniuk
4ea0cb5035 Add license and SUSE copyright 2015-07-08 18:50:37 +02:00
Pedro Algarvio
631cee1627 Merge pull request #25244 from rallytime/parted_deprecations
Remove parted deprecations and fix failing tests
2015-07-08 17:42:00 +01:00
Nicole Thomas
810b1090ac Merge pull request #25242 from ruzarowski/2015.8
Make SourceDestCheck flag available to network interface definition
2015-07-08 10:36:22 -06:00
Joseph Hall
4f2abe5cba Do not resize while iterating 2015-07-08 10:29:22 -06:00
Erik Johnson
08bbfcd4d9 Merge pull request #25231 from thepauleh/patch-1
[25230] Change LXC version to come from lxc-info
2015-07-08 11:09:06 -05:00
rallytime
abfae94e1d Started changing Beryllium references to 2015.8.0 2015-07-08 10:01:03 -06:00
Mike Place
c6efd2356c Merge pull request #25225 from nmadhok/client-runtime-fix-backport-2015-2
Backporting fix for issue #25223 on 2015.5 branch
2015-07-08 09:16:18 -06:00
Mike Place
e6251e78eb Merge pull request #25226 from nmadhok/client-runtime-fix-backport-2015-8
Backporting fix for issue #25223 on 2015.8 branch
2015-07-08 09:11:03 -06:00
rallytime
138c4f1e72 Remove parted deprecations and fix failing tests 2015-07-08 09:03:55 -06:00
Mike Place
169d81ab5a Merge pull request #25224 from nmadhok/client-runtime-fix
Fixing issue which causes Runtime Errors because of changing the list which is being looped over
2015-07-08 09:01:44 -06:00
Mike Place
98e4fde483 Merge pull request #25234 from krak3n/fix/boto_asg_update_args
Fix: Bug in boto_asg state argument passing to boto_asg module
2015-07-08 08:59:26 -06:00
Mike Place
3adfcf26fb Merge pull request #25227 from nmadhok/doc-fix
Changing the way links look on the index page
2015-07-08 08:57:28 -06:00
Mike Place
5db000d9ca Merge pull request #25222 from rallytime/bp-25219
Back-port #25219 to 2015.8
2015-07-08 08:55:17 -06:00
Dmitry Kuzmenko
ca233e56e5 RunnerClient support old style commands with kwargs on top level.
1. Use low['args'] low['kwargs'] if specified and not empty in the low data.
2. Lookup root level and set kwargs in low data if missing.
2015-07-08 17:53:46 +03:00
Dmitry Kuzmenko
96ab4e1607 Revert "Fixed GET /jobs/<id> requests"
This reverts commit 954ba6eba9.
2015-07-08 17:53:46 +03:00
Rafael Uzarowski
62b6d4faef Make SourceDestCheck flag available to network interface definition 2015-07-08 16:44:59 +02:00
Dmitry Kuzmenko
0c5e53b6e1 Minor bugfixes in pillarenv support 2015-07-08 17:38:38 +03:00