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
50,225 Commits 24 Branches 182 Tags 341 MiB
ef3893d4de
Commit Graph

50225 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshua Semar
95aa3518d5 fix cas behavior on data module 
data.cas was not saving changes.  We now call dump after
receiving the change
 2015-03-30 16:01:28 -05:00
Nicole Thomas
28fb7df29e Merge pull request #22166 from rallytime/fix_bluez_test 
Use lists, not dicts, for MagicMock side_effect
 2015-03-30 14:58:55 -06:00
Sergey Kizunov
ed3124dfd6 Bugfix: Reactor missing import. 
This missing import causes the Reactor not to fire in certain cases. This could be related with issue #21651.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2015-03-30 14:32:06 -06:00
Nicole Thomas
56fefa5bca Merge pull request #22165 from skizunov/develop 
Bugfix: Reactor missing import.
 2015-03-30 14:31:26 -06:00
Nicole Thomas
fe808b7920 Merge pull request #22163 from johntron/patch-1 
Improves example illustrating SLS-to-Python mapping
 2015-03-30 14:26:29 -06:00
rallytime
10c1dbe01e Fix remaining pylint errors for cassandra_cql.py 2015-03-30 14:21:17 -06:00
rallytime
3c1bb402bc Whitespace fix 2015-03-30 14:10:40 -06:00
Clint Armstrong
3fb98cdc1a tests working 2015-03-30 16:10:06 -04:00
rallytime
154f1fe1ae Remove unused import 2015-03-30 14:09:42 -06:00
Nicole Thomas
d941579640 Merge pull request #22161 from rallytime/bp-21959 
Backport #21959 to 2014.7
 2015-03-30 13:49:34 -06:00
Nicole Thomas
9bf6f505d1 Merge pull request #22160 from rallytime/bp-22134 
Backport #22134 to 2014.7
 2015-03-30 13:49:20 -06:00
Nicole Thomas
0ee4b82f52 Merge pull request #22159 from rallytime/bp-22120 
Backport #22120 to 2015.2
 2015-03-30 13:49:04 -06:00
Nicole Thomas
f918cf2296 Merge pull request #22158 from rallytime/bp-22107 
Backport #22107 to 2015.2
 2015-03-30 13:48:34 -06:00
rallytime
8b1d3cdeda Use lists, not dicts, for MagicMock side_effect 
Fixes the Python 2.6 test failures on develop
 2015-03-30 13:46:48 -06:00
Sergey Kizunov
f25907f125 Bugfix: Reactor missing import. 
This missing import causes the Reactor not to fire in certain cases. This could be related with issue #21651.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2015-03-30 14:19:23 -05:00
John Syrinek
663b19e5b7 Improves example illustrating SLS-to-Python mapping 2015-03-30 14:04:05 -05:00
rallytime
0fd10caab7 Python 3 compat for nagios_rpc.py 2015-03-30 12:56:39 -06:00
rallytime
0c11fc95be Pylint clean up for cassandra_cql.py 2015-03-30 12:54:03 -06:00
Corin Kochenower
172400c2f9 Make nocache parameter an optional parameter 
The Salt SSH client calls prep_jid without any parameters.
As of this commit, the following python modules define
prep_jid with an optional nocache parameter.

returners/
    couchbase_return.py
    local_cache.py
    multi_returner.py
    postgres_local_cache.py

A of the remaining returners require the nocache parameter
and therefore are incompatible with the Salt SSH client.

To allow the Salt SSH client to work with all returners,
make the nocache parameter in all returners optional.
 2015-03-30 12:41:10 -06:00
Corin Kochenower
0a640facd5 Merge remote-tracking branch 'upstream/develop' into develop 2015-03-30 12:39:24 -06:00
Nicole Thomas
f44b1d08af Merge pull request #22156 from amendlik/chef-solo-fix 
Fix arguments passed to chef-solo command
 2015-03-30 12:25:52 -06:00
Nitin Madhok
3143a54817 Excluding get_configured_provider() and script() from sphinx 2015-03-30 14:22:23 -04:00
Giuseppe Iannello
b9d55bc88a Changed argument name 
Renamed an argument to align to the naming convention of the render() method in all the other renderers. Incidentally fixes #21956
 2015-03-30 12:19:35 -06:00
Zach Boody
061d085445 Fixes #9960 2015-03-30 12:10:53 -06:00
cr0hn
aafb4a98c3 Update vt.py 
Add check for base OS running salt. BSD-like OS break at this point
 2015-03-30 12:09:04 -06:00
Ryan Lane
b0e7078402 Fix for grafana dict profiles 2015-03-30 12:07:12 -06:00
Mike Place
adb50caba1 Merge pull request #22118 from surajssd/issue-21721 
Datetime support for msgpack for issue-21721
 2015-03-30 11:57:43 -06:00
jfindlay
00749a5da8 Merge pull request #21937 from isbm/isbm-lvm-fixes 
LVM module bugfixes
 2015-03-30 11:52:25 -06:00
Andrea-Redi Tsarida
b1f91cf0fb items() 2015-03-30 19:09:51 +02:00
C. R. Oldham
e830584904 Clean up some arguments. 2015-03-30 10:54:11 -06:00
Gareth J. Greenaway
a0c8a74ac0 Adding missing versionadded tags 2015-03-30 09:50:35 -07:00
Mike Place
4538ea629f Merge pull request #22057 from jfindlay/opts_prefix 
remove default prefix of '-' in archive.tar and archive.cmd_unzip
 2015-03-30 10:45:11 -06:00
Colton Myers
c0923a236c Fix typo 2015-03-30 10:41:57 -06:00
Mike Place
fe4a09d4f7 Merge pull request #22150 from terminalmage/fix-dockerio-save 
Fix broken salt.module.dockerio.save
 2015-03-30 10:40:02 -06:00
Mike Place
27465e0f0f Merge pull request #22129 from terminalmage/docker-ng 
Add docker-ng module
 2015-03-30 10:37:45 -06:00
Gareth J. Greenaway
cadc6cacd3 General cleanup. Returning errors and comments rather than just False when things go wrong. 2015-03-30 09:37:20 -07:00
Mike Place
adb8d5c718 Merge pull request #22054 from jfindlay/log_color 
convert custom LogRecord attribute formatting from {}- to %-style
 2015-03-30 10:37:18 -06:00
Thomas S Hatch
a89de9217d send functions into the beacon loader 
__salt__ for beacons
 2015-03-30 10:33:23 -06:00
Thomas S Hatch
dd5eba2cbd Send execution modules into the beacons system 2015-03-30 10:32:15 -06:00
Mike Place
4ad94fb895 Merge pull request #22154 from cachedout/language_fixup 
Small grammar fixup
 2015-03-30 10:27:49 -06:00
Thomas S Hatch
36eca12cb9 Merge pull request #22121 from tjstansell/fix-20841 
fix #20841: add sls name from reactor
 2015-03-30 10:27:42 -06:00
Mike Place
b98269ad38 Small grammar fixup 2015-03-30 10:27:06 -06:00
Mike Place
8ff88d6b89 Merge pull request #22078 from pengyao/summary 
Adjust cli_summary
 2015-03-30 10:25:05 -06:00
Aditya Kulkarni
bfa97f30bd pacing 2015-03-30 10:22:05 -06:00
Aditya Kulkarni
f3a25fd9a6 pylint 2015-03-30 10:22:05 -06:00
Aditya Kulkarni
320f99e645 Format ret list and update docstring for service beacon 2015-03-30 10:22:05 -06:00
Mike Place
5383d25d7e Merge pull request #22065 from jacksontj/2015.2 
Pass opts in as pub_data to salt-run jobs
 2015-03-30 10:20:12 -06:00
C. R. Oldham
f79fa0fcd5 Bring beacon/__init__.py in from develop 2015-03-30 10:16:59 -06:00
Nicole Thomas
d07f02f7f6 Merge pull request #22148 from basepi/merge-forward-2015.2 
[2015.2] Merge forward from 2014.7 to 2015.2
 2015-03-30 10:15:36 -06:00
C. R. Oldham
4e111a638c Make sure _load_modules overridden in ProxyMinion takes same arguments. 2015-03-30 10:11:33 -06:00