valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
57,913 Commits 24 Branches 182 Tags 341 MiB
057fd0729d
Commit Graph

57913 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
057fd0729d Merge pull request #27502 from ticosax/backport-test-from-develop 
Add test to check we don't call inspect_image on absent images.
 2015-09-29 10:15:09 -05:00
Nicolas Delaby
fadd9bd43e Add test to check we don't call inspect_image on absent images. 2015-09-29 15:53:29 +02:00
Erik Johnson
f3da6e4bb3 Merge pull request #27497 from blueyed/dockerng-fix-404-private-forced 
dockerng: fix image_present for forced, non-existent image
 2015-09-29 08:49:46 -05:00
Daniel Hahler
e3c66cea3a dockerng: fix image_present for forced, non-existent image 
With a non-existent image, which is forced, the call to `inspect_image`
will raise a `CommandExecutionError`: "Unable to get info for image".

This commit changes it to only call `inspect_image` for existing images.
 2015-09-29 14:39:27 +02:00
Mike Place
284984e6ba Merge pull request #27411 from terminalmage/issue27205 
Fix invocation of git.config_get and git.config_set
 2015-09-28 16:53:01 -06:00
Erik Johnson
cbcb5475b6 Merge pull request #27477 from terminalmage/issue27217 
Don't append role to hash_cachedir
 2015-09-28 17:26:34 -05:00
Nicole Thomas
2f71833260 Merge pull request #27474 from whiteinge/docs-pymongo-fix 
Add fake pymongo version attribute for the docs
 2015-09-28 15:49:25 -06:00
Nasenbaer
c185e99970 Second attempt to fix #27217 2015-09-28 15:46:46 -05:00
Mike Place
9202f956f3 Merge pull request #27466 from blueyed/fix-gnupg-version 
Fix version reporting of python-gnupg and mysql-python
 2015-09-28 14:25:00 -06:00
Seth House
64b54e668a Add fake pymongo version attribute for the docs 
This bypasses the following traceback when building the docs.

File "/Users/shouse/src/salt/salt/salt/returners/mongo_future_return.py", line 72, in <module>
    version = '.'.join(version.split('.')[:2])
TypeError: 'Mock' object has no attribute '__getitem__'
 2015-09-28 13:51:31 -06:00
Mike Place
6d8e9af297 Merge pull request #27465 from ticosax/fix-dockerng-cmd 
Fix usage of dockerng "cmd" was #27459
 2015-09-28 13:27:41 -06:00
Mike Place
aefe6d794a Merge pull request #27417 from whiteinge/bp-25243 
Backport #25243 into 2015.8
 2015-09-28 13:15:53 -06:00
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
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
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
c639931340 Merge pull request #27450 from ticosax/fix-typo 
[dockerng] Fix typo in docstring
 2015-09-28 08:27:35 -06:00
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
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
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
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
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
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
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