Thomas S Hatch
906719d691
Merge branch 'retcode_failure_test' of https://github.com/cro/salt into cro-retcode_failure_test
2014-10-15 16:56:12 -06:00
Thomas S Hatch
494527a442
Merge pull request #16659 from etuttle/s3fs-dirs
...
Properly discover directories in s3fs file server. Fixes #16638 .
2014-10-15 16:53:13 -06:00
Thomas S Hatch
99e42f5788
Merge pull request #16662 from rallytime/bp-16648
...
Backport #16648 to 2014.7
2014-10-15 16:10:57 -06:00
Thomas S Hatch
4b9178c1b8
Merge pull request #16652 from cachedout/issue_16504
...
Load __salt__ into wrappers for salt-ssh
2014-10-15 16:06:04 -06:00
Thomas S Hatch
03b2b4955c
Merge pull request #16661 from thatch45/fix_rand_thin
...
Fix rand_thin dir system, it was broken in the heredoc PR
2014-10-15 15:35:44 -06:00
Ethan Tuttle
bbae532c01
Properly discover directories in s3fs file server. Fixes #16638 .
...
Also, remove the dirs_only parameter to _find_files in pillar s3,
because it doesn't work in some cases and isn't used anyway.
2014-10-15 14:27:28 -07:00
Mathieu Le Marec - Pasquet
b837be080c
Proper handling of watch with onlyif/unless
...
This fixes #16647
2014-10-15 15:11:04 -06:00
Thomas S Hatch
3b981dac7b
Fix rand_thin dir system, it was broken in the heredoc PR
2014-10-15 14:49:52 -06:00
Thomas S Hatch
623a11d067
Merge pull request #16653 from thatch45/heredoc
...
Fix #16645
2014-10-15 13:26:16 -06:00
Mike Place
6d8173d262
Adding TODO
2014-10-15 12:12:46 -06:00
Thomas S Hatch
3f9e40266b
Fix #16645
2014-10-15 12:06:54 -06:00
Mike Place
c01cb59a84
Load __salt__ into wrappers for salt-ssh
...
Courage is not simply one of the virtues, but the form of every virtue
at the testing point.
- C. S. Lewis
2014-10-15 11:48:40 -06:00
Colton Myers
36966afa70
Merge pull request #16649 from basepi/ping_on
...
ping_on_rotate, not ping_on_key_rotate
2014-10-15 09:26:01 -07:00
Colton Myers
e1a2708164
The actual config option is ping_on_rotate
2014-10-15 09:24:15 -07:00
Pedro Algarvio
cc4d877d5f
Merge pull request #16641 from thatch45/rand_thin
...
Allows for the use or random thin dirs, fix #16308
2014-10-15 13:15:27 +01:00
Thomas S Hatch
aaf53e1c3f
Merge branch '2014.7' into rand_thin
...
Conflicts:
salt/client/ssh/__init__.py
2014-10-15 01:30:03 -06:00
Thomas S Hatch
d44dc2272a
Merge pull request #16640 from thatch45/send_ext_mods
...
Send ext mods better
2014-10-15 01:14:39 -06:00
Thomas S Hatch
6db0906e17
Fix error when there are no ext_mods to deploy
2014-10-15 00:49:38 -06:00
Thomas S Hatch
8bad687994
don't pass in bad mods
2014-10-15 00:36:54 -06:00
Thomas S Hatch
cafd6a4b67
remove unused import
2014-10-15 00:09:06 -06:00
Thomas S Hatch
c4924f727b
Merge branch '2014.7' into send_ext_mods
...
Conflicts:
salt/client/ssh/__init__.py
2014-10-14 23:59:45 -06:00
Thomas S Hatch
c7ff3fed45
Allows for the use or randome thin dirs, fix #16308
2014-10-14 23:54:47 -06:00
Thomas S Hatch
177ed820e6
Merge pull request #16637 from thatch45/ooband_ext
...
Add -w --wipe option to salt-ssh to clear the deploy when done
2014-10-14 23:34:12 -06:00
Thomas S Hatch
cb81f6a5fd
deploy ext_mods to the right place
2014-10-14 23:24:23 -06:00
Thomas S Hatch
686a96fb3f
Fix versioning in ext_mods and add formatting to ext_mods wrapped calls
2014-10-14 23:23:31 -06:00
Thomas S Hatch
7ca73f1453
correctluy condition the return data from ext_mods wraped calls
2014-10-14 23:04:25 -06:00
Thomas S Hatch
7694bc37d7
add deploy_ext method
2014-10-14 22:46:49 -06:00
Thomas S Hatch
01508512bf
add ext_mods tarball seq to system
2014-10-14 22:41:35 -06:00
Thomas S Hatch
71cfd3821b
initial work on creation of ext_mods tarfile
2014-10-14 22:24:42 -06:00
Thomas S Hatch
fc890492e7
modify shim to recive tarball ext_mods
2014-10-14 21:33:22 -06:00
Thomas S Hatch
436210424f
remove stdin hook for ext_mods
2014-10-14 21:09:41 -06:00
Thomas S Hatch
c15231d9c0
Need to use subprocess if wipeing
2014-10-14 20:52:08 -06:00
Thomas S Hatch
fe97b0a51d
Add -w --wipe option to salt-ssh to clear the deploy when done
2014-10-14 20:26:40 -06:00
Thomas S Hatch
9e1843be6d
Merge pull request #16446 from cachedout/issue_15673
...
Greedy/non-greedy minion matching
2014-10-14 14:04:53 -06:00
C. R. Oldham
d07ebe2105
Test for retcode
2014-10-14 13:28:19 -06:00
Thomas S Hatch
8509aebfa1
Merge pull request #16628 from cachedout/pillar_overwrite_docs
...
Document pillar ovewrite strategy
2014-10-14 13:20:50 -06:00
Mike Place
d0e90c77a6
Typo fix
2014-10-14 13:18:54 -06:00
Thomas S Hatch
d9084d9ef1
Merge pull request #16624 from rallytime/bp-15036
...
Backport #15036 to 2014.7
2014-10-14 13:13:45 -06:00
Mike Place
0fcc0b5ae7
Document pillar ovewrite strategy
2014-10-14 13:07:26 -06:00
Mike Place
defa5c0cfd
OK, that was just embaressing
2014-10-14 12:04:22 -06:00
Mike Place
b68ac64678
Lint fixing
2014-10-14 11:48:42 -06:00
Thomas S Hatch
7c1da1d206
Merge pull request #16615 from s0undt3ch/hotfix/bootstrap-script
...
[2014.7] Update to latest stable bootstrap script v2014.10.14
2014-10-14 11:17:41 -06:00
Thomas S Hatch
90d2c08883
Merge pull request #16617 from mzdaniel/16610-salt-call-ssh-SLS-custom-module
...
salt-call/ssh, issue #16610
2014-10-14 11:17:13 -06:00
Daniel Rodriguez
7b89124162
Fix linting error
2014-10-14 10:03:28 -06:00
Daniel Rodriguez
b212ef65c5
Fix error message command argument
2014-10-14 10:03:28 -06:00
Daniel Rodriguez
c51a1f1f75
Add no_use_wheel option to pip.installed
2014-10-14 10:03:28 -06:00
Daniel Rodriguez
58dc67b2f6
Fix linting error
2014-10-14 10:03:28 -06:00
Daniel Rodriguez
fee233932c
Add no_use_wheel option to pip.install
2014-10-14 10:03:28 -06:00
Pedro Algarvio
da901f7adf
Update to latest stable bootstrap script v2014.10.14
...
* Fixed a regex issue with matching Salt's tags. Match v2014.7 but not 2014.7 as a valid tag
* Distro Support Added:
* Added Linux Mint 17 support(Thanks Skyler Berg)
* Disrto Suuport Fixed:
* Init pacman keys if not done so previously
2014-10-14 05:45:35 +01:00
Mike Place
39845d2cd2
Merge pull request #16612 from saltstack/revert-16611-issue_16370_1
...
Revert "New onchanges/onfail failure types for requisite resolver"
2014-10-13 22:16:21 -06:00
