valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
58,006 Commits 24 Branches 182 Tags 341 MiB
ae09a0fb61
Commit Graph

58006 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
927874d316 Merge pull request #27469 from twangboy/fix_27433 
Added quotes to version numbers example
 2015-09-28 15:54:43 -06: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
Nicolas Delaby
b184faa55b Enforce usage of host_config and require docker-py>=1.4.0 2015-09-28 23:24:57 +02:00
Nasenbaer
c185e99970 Second attempt to fix #27217 2015-09-28 15:46:46 -05:00
Ryan Lane
a01f8ac62c Use __states__ for calls to other boto states 2015-09-28 13:44:08 -07:00
Niels Abspoel
a8f2dad1be fix locale on opensuse and suse #27438 2015-09-28 22:35:41 +02: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
Mike Place
382a53403f Merge pull request #27467 from cachedout/lint_27375 
file.managed: check contents_{pillar|grain} result
 2015-09-28 14:22:16 -06:00
Erik Johnson
fa70ef2e31 salt.utils.gitfs: Don't use close_fds=True on Windows 
Fixes #27220.
 2015-09-28 14:52:08 -05: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
5e745ad6da Change recommeded schema for data field in mysql event table 
Closes #27447
 2015-09-28 13:32:02 -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
Mike Place
0bc37c0d41 Fix test 2015-09-28 12:57:22 -06:00
twangboy
a996ea46e2 Added quotes to version numbers example 
Fixes #27433
 2015-09-28 12:52:59 -06:00
Mike Place
4e54a98f5e Lint #27375 2015-09-28 12:46:28 -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
Mike Place
ed6207a438 Merge pull request #27419 from rallytime/fix-9856 
Amend error log to include multiple tips for troubleshooting.
 2015-09-28 11:53:19 -06: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
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
73fa89edf7 Merge pull request #27426 from rallytime/fix-16753 
Don't stacktrace if there are conflicting id errors in highstate
 2015-09-28 08:52:51 -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
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