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
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
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
Mike Place
7241e55c40
Revert "New onchanges/onfail failure types for requisite resolver"
2014-10-13 22:15:44 -06:00
Mike Place
9fbf4e66bc
Merge pull request #16611 from cachedout/issue_16370_1
...
New onchanges/onfail failure types for requisite resolver
2014-10-13 22:15:37 -06:00
Daniel Mizyrycki
004f940c16
salt-call/ssh, issue #16610 :
...
Fix a regression when modules are called within an SLS
2014-10-13 21:00:48 -07:00
Thomas S Hatch
4b630d77ed
Merge pull request #16407 from s0undt3ch/hotfix/cache-loaded-configs
...
First attempt at caching the loaded configuration from the filesystem.
2014-10-13 20:05:52 -06:00
Thomas S Hatch
a750203288
Merge pull request #16608 from lyft/fix-cloud-config-in-boto-asg
...
Yaml dump a dict, rather than an odict for boto_asg cloud-config
2014-10-13 17:40:29 -06:00
Thomas S Hatch
d396a8637a
Merge pull request #16609 from jacksontj/2014.7
...
Update ACL docs to include @jobs markup
2014-10-13 17:40:02 -06:00
Thomas S Hatch
b563ae6a3a
Merge pull request #16603 from rallytime/bp-16385
...
Backport #16385 to 2014.7
2014-10-13 17:39:39 -06:00
Thomas S Hatch
7891c60f62
Merge pull request #16602 from rallytime/bp-16572
...
Backport #16572 to 2014.7
2014-10-13 17:39:12 -06:00
Thomas S Hatch
e603e18dd4
Merge pull request #16601 from rallytime/bp-16591
...
Backport #16591 to 2014.7
2014-10-13 17:39:07 -06:00
Thomas S Hatch
c8319cff4c
Merge pull request #16587 from terminalmage/issue16583
...
Don't yamlify args containing only digits and underscores
2014-10-13 17:38:12 -06:00
Thomas Jackson
e60f47052e
Update ACL docs to include @jobs markup
2014-10-13 16:13:23 -07:00
Ryan Lane
6b7a54ea48
Yaml dump a dict, rather than an odict for boto_asg cloud-config
2014-10-13 16:06:48 -07:00
akilesh1597
a8843ff0ba
fix ini_manage lint error
2014-10-13 15:42:20 -06:00
akilesh1597
7697eee393
create new file if not already present
2014-10-13 15:41:43 -06:00
Mathieu Le Marec - Pasquet
d1361a1f78
tolerant encoding print in print_cli
2014-10-13 15:32:11 -06:00
Mathieu Le Marec - Pasquet
2d1200b64e
pep8
2014-10-13 15:32:11 -06:00
Mathieu Le Marec - Pasquet
acd15e386e
display traceback in test error
2014-10-13 15:32:11 -06:00
Mathieu Le Marec - Pasquet
1c4616556a
Another fix for outputter reliability
2014-10-13 15:32:10 -06:00
Mathieu Le Marec - Pasquet
287aee9fd1
Better test for output stream existence
2014-10-13 15:32:10 -06:00
Mathieu Le Marec - Pasquet
bc623e8430
Fix encoding issue with collateral damages...
2014-10-13 15:32:10 -06:00
Mathieu Le Marec - Pasquet
9987bb7a97
fix absent key dir
2014-10-13 15:26:46 -06:00
Erik Johnson
7048f9c760
Only skip yamlification if there's actually an underscore
...
This fixes test breakage.
2014-10-13 15:38:40 -05:00
