Thomas S Hatch
|
b6b82165c8
|
Merge pull request #23176 from jfindlay/run_chroot
copy standard cmd.run* kwargs into cmd.run_chroot
|
2015-04-30 08:22:12 -07:00 |
|
Jayesh Kariya
|
c64a939446
|
adding states/eselect unit test case
|
2015-04-30 15:49:02 +05:30 |
|
Jayesh Kariya
|
b4b027c547
|
adding states/drac unit test case
|
2015-04-30 15:47:53 +05:30 |
|
Jayesh Kariya
|
946872e87f
|
adding states/disk unit test case
|
2015-04-30 15:46:39 +05:30 |
|
Jayesh Kariya
|
0e5f4a7087
|
adding states/debconfmod unit test case
|
2015-04-30 15:44:29 +05:30 |
|
Jayesh Kariya
|
818aab8a6f
|
adding states/ddns unit test case
|
2015-04-30 15:43:17 +05:30 |
|
Jayesh Kariya
|
05ff008741
|
adding states/composer unit test case
|
2015-04-30 15:41:45 +05:30 |
|
Justin Findlay
|
effacbe294
|
Merge pull request #23193 from joejulian/2014.7_supervisord_accept_sfun
supervisord.mod_watch should accept sfun
|
2015-04-29 22:34:21 -06:00 |
|
Justin Findlay
|
72fe88e5c6
|
Merge pull request #23188 from basepi/salt-ssh.function.wrapper.gpg.19114
[2014.7] Work around bug in salt-ssh in config.get for gpg renderer
|
2015-04-29 22:34:10 -06:00 |
|
Joe Julian
|
efb59f9d9d
|
supervisord.mod_watch should accept sfun
Fixes #23192
|
2015-04-29 16:03:41 -07:00 |
|
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
|
d73979ee12
|
Work around bug in salt-ssh in config.get for gpg renderer
|
2015-04-29 16:17:35 -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 |
|
Justin Findlay
|
72066e1073
|
fix typos from 36841bdd in masterapi.py
Fixes #23166.
|
2015-04-29 13:19:39 -06:00 |
|
Justin Findlay
|
7dc3417b44
|
copy standard cmd.run* kwargs into cmd.run_chroot
Fixes #23153.
|
2015-04-29 12:24:52 -06: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 |
|
Viet Hung Nguyen
|
c749c276b4
|
fix lint - remove unnecessary parenthesis
|
2015-04-29 09:56:06 +07: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 |
|
Cristi P
|
8ffa12e82d
|
Fixes #23148
|
2015-04-29 00:29:36 +03: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 |
|