Commit Graph

58027 Commits

Author SHA1 Message Date
Nicolas Delaby
9cea62de67 Fix typo in docstring 2015-09-28 09:24:15 +02:00
Joseph Hall
333c305ba0 Merge pull request #27430 from jacksontj/2015.8
Fix bug introduced in eee0291ff8
2015-09-25 19:09:40 -06:00
Thomas Jackson
d2aff12f8f Fix bug introduced in eee0291ff8
During the cleanup the tuple was made into... nothing that python can interpret
2015-09-25 16:59:09 -07:00
Joseph Hall
5dd1b70475 Merge pull request #27408 from rallytime/fix-27406-for-2015.5
Fix avail_locations function for the softlayer_hw driver in 2015.5
2015-09-25 17:34:50 -06:00
rhealitycheck
e39a57afe1 Update mongo_return.py 2015-09-25 17:18:45 -06:00
rhealitycheck
f796c9a44b Update mongo_return.py 2015-09-25 17:18:45 -06:00
rhealitycheck
30d07cbb27 Update mongo_return.py 2015-09-25 17:18:45 -06:00
rhealitycheck
44ef4b48fb Update mongo_future_return.py 2015-09-25 17:18:45 -06:00
rhealitycheck
34b160b841 Update mongo_return.py 2015-09-25 17:18:45 -06:00
rhealitycheck
b2b5623da3 Update mongo_future_return.py 2015-09-25 17:18:45 -06:00
rhealitycheck
07f9a8b95b Update mongo_return.py 2015-09-25 17:18:45 -06:00
rhealitycheck
b7ddc83b4d Update mongo_future_return.py 2015-09-25 17:18:45 -06:00
rhealitycheck
540b3f2690 Update mongo_return.py 2015-09-25 17:18:45 -06:00
rhealitycheck
405edd0718 Update mongo_future_return.py 2015-09-25 17:18:44 -06:00
rhealitycheck
5c753a54ff Update mongo_return.py
Fixing issues with serializing ObjectId in master.py -- apparently pymongo modifies the original load object to have the ObjectId generated by it. Will raise an issue with them because it shouldn't be modifying static data IMHO
2015-09-25 17:18:44 -06:00
rhealitycheck
06e05befa7 Update mongo_future_return.py
Fixing issues with serializing ObjectId in master.py -- apparently pymongo modifies the original load object to have the ObjectId generated by it. Will raise an issue with them because it shouldn't be modifying static data IMHO.
2015-09-25 17:17:25 -06:00
Colton Myers
1f4ca089a2 Merge pull request #27418 from terminalmage/file-rename
Don't always remove dest path in salt.utils.files.rename()
2015-09-25 17:09:59 -06:00
Kevin King
6969326ae2 doc: added documentation to cloud roster and fixed whitespace 2015-09-25 17:03:19 -06:00
Kevin King
b4334649d5 Allow cloud roster to use sudo
Similar to issue #26689, but I am using the cloud roster file to get the IP targets generated from running salt-cloud.
2015-09-25 17:03:19 -06:00
Erik Johnson
c3a17ae992 add missing commas 2015-09-25 18:00:43 -05:00
rallytime
f6cbd81e66 Don't stacktrace if there are conflicting id errors in highstate
Fixes #16753
2015-09-25 16:48:33 -06:00
Colton Myers
ec5faf1829 Merge pull request #27383 from twangboy/fix_27032
Uninstaller only removes specific files and dirs
2015-09-25 16:47:24 -06:00
Colton Myers
9ab3c6dc5d Merge pull request #27416 from rallytime/bp-27399
Back-port #27399 to 2015.8
2015-09-25 16:39:07 -06:00
Colton Myers
8f9a3cfbaf Merge pull request #27410 from jacobhammons/doc-updates
Fix css layout Refs #27389
2015-09-25 16:38:48 -06:00
Erik Johnson
9842d9728b Merge pull request #27394 from jacksontj/2015.8
Remove streamed response for fileclient to avoid HTTP redirection problems
2015-09-25 16:55:31 -05:00
David Murphy
63407fd2a9 Changes to support configurable repository for Debian / Ubuntu 2015-09-25 14:18:25 -06:00
Colton Myers
44b246bf93 Merge pull request #27415 from lyft/fix-pecl
Backwards compat fixes for pecl module
2015-09-25 13:40:55 -06:00
rallytime
551396564a Ammend error log to include multiple tips for troubleshooting.
Fixes #9856
2015-09-25 13:01:01 -06:00
rallytime
39a4ae5a6c Remove hdd: 19 refs from SL docs - no longer available from SoftLayer. 2015-09-25 12:54:25 -06:00
Erik Johnson
7bc0949d48 Don't always remove dest path in salt.utils.files.rename()
This prevents an extra system call on non-Windows platforms.
2015-09-25 13:53:53 -05:00
rallytime
de2f9234d3 Use correct default for bandwith 2015-09-25 12:50:13 -06:00
Thomas Jackson
01132c305c Re-add files.rename call instead of os.rename 2015-09-25 11:49:40 -07:00
Dmitry Kuzmenko
53e7a6b7c5 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-09-25 12:47:57 -06:00
rallytime
42d8127f79 Don't set the optional_products default to a boolean, and then try to loop. 2015-09-25 12:43:59 -06:00
Dmitry Kuzmenko
10b522b86c Revert "Fixed GET /jobs/<id> requests"
This reverts commit 954ba6eba9.
2015-09-25 12:41:58 -06:00
Jonathan Ballet
1d848118c9 doc: fixed indentation in salt.renderers.jinja's documentation 2015-09-25 12:16:48 -06:00
Jonathan Ballet
f5d053a033 doc: fixed indentation in salt.modules.consul's documentation 2015-09-25 12:16:48 -06:00
Jonathan Ballet
06beea6b2f doc: fix etcd state documentation typos 2015-09-25 12:16:48 -06:00
Jonathan Ballet
97e69ebb97 doc: fix state's top documentation typo 2015-09-25 12:16:48 -06:00
Jonathan Ballet
b411730d60 doc: fix documentation formatting for state blockdev 2015-09-25 12:16:47 -06:00
Jonathan Ballet
ce91bb9446 doc: fix formatting in state boto_elb 2015-09-25 12:16:47 -06:00
Jonathan Ballet
c69229875e doc: fix links in Docker state documentation 2015-09-25 12:16:47 -06:00
Jonathan Ballet
15b751d6e2 doc: Docker state use ports and not port_bindings anymore 2015-09-25 12:16:47 -06:00
Jonathan Ballet
880b6e0944 doc: fix link to docker-py documentation 2015-09-25 12:16:47 -06:00
Jonathan Ballet
33db0c27f8 doc: fix RAET links 2015-09-25 12:16:47 -06:00
Jonathan Ballet
e69ba2f943 doc: fix rendering of salt.states.hipchat 2015-09-25 12:16:47 -06:00
Nicole Thomas
d76a77c911 Merge pull request #27407 from saltstack/meggiebot-patch-1
Adding stretch label definition
2015-09-25 12:10:46 -06:00
Ryan Lane
8be8ef585c Backwards compat fixes for pecl module 2015-09-25 11:07:37 -07:00
Jacob Hammons
a9fdecada1 Fix css layout Refs #27389
sample typo fix in linux_acl
additional module folders listed in dynamic-modules
2015-09-25 11:25:14 -06:00
rallytime
9d8a3d8303 Fix avail_locations function for the softlayer_hw driver in 2015.5
Fixes #27406
2015-09-25 11:04:45 -06:00