valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
47,516 Commits 24 Branches 182 Tags 341 MiB
818aab8a6f
Commit Graph

47516 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jayesh Kariya
818aab8a6f adding states/ddns unit test case 2015-04-30 15:43:17 +05:30
Justin Findlay
04078927e1 Merge pull request #23184 from steverweber/2015.2 
if not cloud config file set yaml as empty dict
 2015-04-29 16:29:58 -06:00
Colton Myers
977d4303df Merge pull request #23173 from basepi/merge-forward-2015.2 
[2015.2] Merge forward from 2014.7 to 2015.2
 2015-04-29 14:20:53 -06:00
Steve Weber
583d3d9aed if not cloud config file set yaml as empty dict 
if not cloud config file set yaml as empty dict
 2015-04-29 16:20:05 -04:00
Colton Myers
21d9de2995 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    salt/fileclient.py
    salt/utils/serializers/yaml.py
 2015-04-29 11:47:06 -06:00
Justin Findlay
afc192405c Merge pull request #23149 from whiteinge/doc-reactor-render-logs 
Added note about debugging reactor files to see the rendered output
 2015-04-29 10:21:49 -06:00
Justin Findlay
168508ec2a Merge pull request #23154 from cachedout/refresh_channel 
Re-establish channel on interruption in fileclient
 2015-04-29 10:18:59 -06:00
Justin Findlay
2ad2840936 Merge pull request #23169 from jayeshka/rh_ip-unit-test 
adding rh_ip unit test case
 2015-04-29 09:20:19 -06:00
Justin Findlay
9e474a2946 Merge pull request #23168 from jayeshka/cmd-states-unit-test 
adding states/cmd unit test case
 2015-04-29 09:19:10 -06:00
Jayesh Kariya
526383deaa adding states/cmd unit test case 2015-04-29 17:31:23 +05:30
Jayesh Kariya
636c654205 adding rh_ip unit test case 2015-04-29 17:29:37 +05:30
Justin Findlay
76332ebc4c Merge pull request #23161 from cro/missing_binary_flag 
Attempt to fix Windows "Could not deserialize msgpack message" stack traces
 2015-04-28 22:00:57 -06:00
C. R. Oldham
3acff08501 Attempt to fix Windows "Could not deserialize msgpack message" stacktraces 2015-04-28 20:53:59 -06:00
Mike Place
9f8dd80c38 Re-establish channel on interruption in fileclient 
Refs #21480
 2015-04-28 16:03:15 -06:00
Mike Place
57dcfd4143 Merge pull request #23106 from makinacorpus/lxcdns2 
lxc.set_dns: handle also resolvconf based installs
 2015-04-28 14:59:18 -06:00
Seth House
35c91881ab Added note about debugging reactor files to see the rendered output 2015-04-28 14:48:38 -06:00
Justin Findlay
3b53e04534 Merge pull request #23146 from rallytime/bp-20779 
Backport #20779 to 2014.7
 2015-04-28 14:45:06 -06:00
Justin Findlay
8bb4664bf9 Merge pull request #23145 from rallytime/bp-23089 
Backport #23089 to 2014.7
 2015-04-28 14:44:56 -06:00
Justin Findlay
c85d36fd29 Merge pull request #23144 from rallytime/bp-23124-2014-7 
Backport #23124 to 2014.7
 2015-04-28 14:44:46 -06:00
Justin Findlay
45153aafd8 Merge pull request #23143 from rallytime/bp-23124 
Backport #23124 to 2015.2
 2015-04-28 14:44:42 -06:00
Mike Place
5a0bb1ce22 Merge pull request #23052 from steverweber/2015.2 
fix issues that causes modules not to load if one file raises error
 2015-04-28 14:41:25 -06:00
Mike Place
b4bf7763e3 Merge pull request #23059 from s0undt3ch/features/py-min-version-lint 
Start checking code to enforce a minimum python version support
 2015-04-28 14:05:23 -06:00
Colton Myers
45d0fd04bf Merge pull request #23078 from s0undt3ch/hotfix/fix-ssh-orchestration 
[2015.2] Fix ssh orchestration
 2015-04-28 14:00:29 -06:00
Justin Findlay
ffd18493e8 compare OrderedDicts in serializer unit test 2015-04-28 13:30:16 -06:00
Mike Place
a22170627c Just change serialize 2015-04-28 13:30:16 -06:00
Mike Place
a111798e8e Use declared yaml options 
Fixes #20647
 2015-04-28 13:30:15 -06:00
Mike Place
93c41afd23 Stringify version number before lstrip 2015-04-28 13:27:54 -06:00
Kevin Boulain
6b64da706c fix parsing the output of parted 2015-04-28 13:23:42 -06:00
Kevin Boulain
a9777c6167 fix tests for the parted module 2015-04-28 13:22:54 -06:00
Kevin Boulain
b5429de7c0 fix parsing the output of parted 2015-04-28 13:22:54 -06:00
Nicole Thomas
4515aae38b Merge pull request #23142 from rallytime/merge-23140 
Merge 23140
 2015-04-28 13:17:21 -06:00
rallytime
7116df9ec7 Add the .0 to 2015.2 versionadded 2015-04-28 13:15:43 -06:00
Justin Findlay
65e1d0bd91 Merge pull request #23137 from jfindlay/merge_23126 
adding states/cloud unit test case
 2015-04-28 12:01:45 -06:00
Seth House
1e6f6be184 Flesh out orchestrate_single and orchestrate_high with CLI examples 2015-04-28 11:38:28 -06:00
C. R. Oldham
003ac71126 Merge pull request #23135 from basepi/merge-forward-2015.2 
[2015.2] Merge forward from 2014.7 to 2015.2
 2015-04-28 10:31:04 -06:00
Colton Myers
a8f797e0e4 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-04-28 09:48:53 -06:00
Colton Myers
a27b158153 Merge pull request #23120 from terminalmage/fix-gitfs-relpath 
Don't run os.path.relpath() if repo doesn't have a "root" param set
 2015-04-28 09:46:54 -06:00
Jayesh Kariya
03ac21072d adding states/cloud unit test case 2015-04-28 09:45:52 -06:00
Justin Findlay
fcba607978 Merge pull request #23132 from clinta/patch-2 
Backport b27c176
 2015-04-28 09:00:30 -06:00
Justin Findlay
3df2a8e88d Merge pull request #23128 from jayeshka/rest_service-unit-test 
adding rest_service unit test case
 2015-04-28 08:16:54 -06:00
Justin Findlay
314bb74a37 Merge pull request #23129 from jayeshka/rest_package-unit-test 
adding rest_package unit test case
 2015-04-28 08:16:12 -06:00
Clint Armstrong
a824d727d1 Backport b27c176 
Backport the [b27c176](b27c176f1c) to 2014.07.

check_cmd does not work without it.
 2015-04-28 09:46:02 -04:00
Jayesh Kariya
975ea49808 adding rest_service unit test case 2015-04-28 18:06:55 +05:30
Jayesh Kariya
4b7be9ffb8 adding rest_package unit test case 2015-04-28 18:04:43 +05:30
Justin Findlay
b0f4b28487 Merge pull request #23114 from rallytime/remove_ubuntu_zmq4_docs 
Adjust ZeroMQ 4 docs to reflect changes to Ubuntu 12 packages
 2015-04-27 21:59:24 -06:00
Justin Findlay
db4fd0bf32 Merge pull request #23107 from rallytime/bp-23024 
Backport #23024 to 2015.2
 2015-04-27 21:58:56 -06:00
Justin Findlay
399857f20b Merge pull request #23108 from rallytime/bp-23097 
Backport #23097 to 2014.7
 2015-04-27 21:58:05 -06:00
Justin Findlay
5541537c32 Merge pull request #23112 from basepi/mysql_returner_save_load 
[2014.7] Backport #22199 to fix mysql returner save_load errors
 2015-04-27 21:55:44 -06:00
Justin Findlay
99790f18f2 Merge pull request #23115 from UtahDave/2015.2local 
import and namespace _mkstemp_copy
 2015-04-27 21:54:04 -06:00
Nicole Thomas
dfe2066b25 Merge pull request #23113 from saltstack/revert-22925-bp-22895 
Revert "Backport #22895 to 2014.7"
 2015-04-27 21:27:29 -06:00