Daniel Hahler
9c1454fe59
Fix version reporting of mysql-python
...
The module is called `MySQLdb`, not `mysql-python`.
Without this, the version for `mysql-python` will not show up with
`salt-call --versions-report`.
2015-09-28 20:13:08 +02:00
Daniel Hahler
437fb4407e
Fix version reporting of python-gnupg
...
The module is called `gnupg`, not `python-gnupg`.
Without this, the version for `python-gnupg` will not show up with
`salt-call --versions-report`.
2015-09-28 20:05:21 +02:00
Nicolas Delaby
a1ed6cda56
Skip test if docker-py is not installed
2015-09-28 19:53:10 +02:00
Mike Place
74095b6b22
Lint
2015-09-28 11:48:51 -06:00
Mike Place
7dcec62fcc
Merge pull request #27441 from Deewiant/issue-27401
...
states.file: allow prepending to non-existent file (#27401 )
2015-09-28 11:40:31 -06:00
Mike Place
a07411a4d9
Merge pull request #27423 from dmurphy18/dgm_envfix
...
Changes to support configurable repository for Debian / Ubuntu
2015-09-28 11:34:22 -06:00
Mike Place
7367a4e32b
Only clean context if it exists
...
Prevents an attribute error
2015-09-28 09:44:27 -06:00
Erik Johnson
6f7769aa94
Correct log messages/docstrings
2015-09-28 10:09:09 -05:00
Nicolas Delaby
cc8471bd1b
dockerpy expect only command argument not cmd
2015-09-28 10:08:40 -05:00
Mike Place
d4d96bb3fc
Merge pull request #27428 from rallytime/bp-27398
...
Back-port #27398 to 2015.8
2015-09-28 09:03:16 -06:00
Mike Place
668c69bd7e
Merge pull request #27429 from rallytime/bp-27344
...
Back-port #27344 to 2015.8
2015-09-28 09:01:20 -06:00
Mike Place
f1f5cc653b
Merge pull request #27431 from jagguli/develop
...
Check Names kwarg is not None
2015-09-28 08:51:48 -06:00
Mike Place
1961dd2726
Merge pull request #27449 from JaseFace/fix-27391-for-develop
...
Ensure we pass on the enable setting if present, or use the default of True if not in build_schedule_item()
2015-09-28 08:51:08 -06:00
Mike Place
c639931340
Merge pull request #27450 from ticosax/fix-typo
...
[dockerng] Fix typo in docstring
2015-09-28 08:27:35 -06:00
EYJ
9f379e1e0c
Add the state function boto_ec2.snapshot_created
2015-09-28 13:13:53 +02:00
Sergei Iakhnin
c501e893f5
Ensure git submodules are initialized when the submodules option is set to true
...
The git.latest state does not initialize submodules when the submodules:True option is specified. Hence, no submodules are fetched.
Steps to reproduce: git.latest any repo with submodules
Fix: add the --init flag to the "git submodule update" call
2015-09-28 11:07:29 +02:00
Nicolas Delaby
9cea62de67
Fix typo in docstring
2015-09-28 09:24:15 +02:00
Jason Wolfe
7522954160
Ensure we pass on the enable setting if present, or use the default of True if not in build_schedule_item()
...
Prior to this, when schedule.present compares the existing schedule to the one crafted by this function, enabled will actually be removed at each run. schedule.present sees a modification needs to be made, and invokes schedule.modify, which does so with enabled: True, creating and endless loop of an 'enabled' removal and addition.
2015-09-27 12:26:37 -07:00
Matti Niemenmaa
8eb5036f1f
states.file: allow prepending to non-existent file ( #27401 )
...
Remove the redundant file.touch invocation also from file.append, to
simplify the flow.
2015-09-27 09:06:51 +03:00
ZhiFeng Hu
58ea4550ba
Doc: copy key to server via ssh-copy-id
...
Signed-off-by: ZhiFeng Hu <hufeng1987@gmail.com>
2015-09-26 22:55:00 +08: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
Steven Joseph
3a234158ad
Check Names kwarg is not None
2015-09-26 10:18:27 +10: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
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
01490387d7
Merge pull request #27344 from rhealitycheck/mongo-returners-patch-1
...
Mongo returners patch 1
2015-09-25 17:12:39 -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
Colton Myers
79fe1ac9c4
Merge pull request #27398 from flowhamster/patch-1
...
Allow cloud roster to use sudo
2015-09-25 16:47:56 -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
4ece4b7ef6
Merge pull request #27396 from hvnsweeting/hvn-ddns
...
doc fix for ddns module, improve keyfile handling
2015-09-25 16:39:35 -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
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
Kevin King
7601355c7a
doc: added documentation to cloud roster and fixed whitespace
2015-09-25 14:05:18 -07: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
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
Thomas Jackson
01132c305c
Re-add files.rename call instead of os.rename
2015-09-25 11:49:40 -07:00
