Bruno Binet
7dfd8b59ce
whitespace cleanup
2015-07-10 09:00:18 +02:00
Bruno Binet
989175defa
use string formatting instead of string substitution
2015-07-10 08:55:54 +02:00
Bruno Binet
7af1332bf2
remove installation section now that PillarStack comes with salt
2015-07-09 12:18:59 +02:00
Bruno Binet
aeb18beb4f
import PillarStack doc from upstream repository readme
2015-07-09 12:17:35 +02:00
Bruno Binet
cbc460059d
import PillarStack ext_pillar from upstream repository
...
wget https://raw.githubusercontent.com/bbinet/pillarstack/master/stack.py
2015-07-09 12:03:38 +02:00
Joseph Hall
d41068ff61
Merge pull request #25276 from jacobhammons/spm-man-page
...
copy spm.1 man page during setup
2015-07-08 20:53:17 -06:00
Jacob Hammons
d27ab32d0e
copy spm.1 man page during setup
...
Refs #25213
2015-07-08 19:25:09 -06:00
Seth House
a2f1a56393
Merge pull request #25122 from arthurlogilab/sharedsecretauth
...
[auth] add sharedsecret auth (closes #25121 )
2015-07-08 19:13:05 -06:00
Colton Myers
0654ef5a08
Merge pull request #25273 from basepi/merge-forward-develop
...
Merge forward from 2015.8 to develop
2015-07-08 18:59:28 -06:00
Seth House
635abd5e18
Merge branch 'runner-kwargs' into develop
2015-07-08 17:39:51 -06:00
Colton Myers
a40574850f
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
2015-07-08 16:26:25 -06:00
Nicole Thomas
9e906030a0
Merge pull request #25263 from techhat/nonstandard
...
Allow non-standard HTTP requests on tornado
2015-07-08 15:27:08 -06:00
Nicole Thomas
4e7346aac4
Merge pull request #25253 from s0undt3ch/2015.8
...
Remove the deprecation warning. The driver has been renamed.
2015-07-08 14:48:31 -06:00
Joseph Hall
ee62c75beb
Allow non-standard HTTP requests on tornado
2015-07-08 14:37:50 -06:00
Nicole Thomas
679cdbac69
Merge pull request #25248 from techhat/issue22391
...
Do not resize while iterating
2015-07-08 13:38:36 -06:00
Pedro Algarvio
ea7afb49d2
Remove the deprecation warning. The driver has been renamed.
2015-07-08 18:07:49 +01:00
Pedro Algarvio
631cee1627
Merge pull request #25244 from rallytime/parted_deprecations
...
Remove parted deprecations and fix failing tests
2015-07-08 17:42:00 +01:00
Nicole Thomas
810b1090ac
Merge pull request #25242 from ruzarowski/2015.8
...
Make SourceDestCheck flag available to network interface definition
2015-07-08 10:36:22 -06:00
Joseph Hall
4f2abe5cba
Do not resize while iterating
2015-07-08 10:29:22 -06:00
Erik Johnson
08bbfcd4d9
Merge pull request #25231 from thepauleh/patch-1
...
[25230] Change LXC version to come from lxc-info
2015-07-08 11:09:06 -05:00
Mike Place
e6251e78eb
Merge pull request #25226 from nmadhok/client-runtime-fix-backport-2015-8
...
Backporting fix for issue #25223 on 2015.8 branch
2015-07-08 09:11:03 -06:00
rallytime
138c4f1e72
Remove parted deprecations and fix failing tests
2015-07-08 09:03:55 -06:00
Mike Place
169d81ab5a
Merge pull request #25224 from nmadhok/client-runtime-fix
...
Fixing issue which causes Runtime Errors because of changing the list which is being looped over
2015-07-08 09:01:44 -06:00
Mike Place
98e4fde483
Merge pull request #25234 from krak3n/fix/boto_asg_update_args
...
Fix: Bug in boto_asg state argument passing to boto_asg module
2015-07-08 08:59:26 -06:00
Mike Place
3adfcf26fb
Merge pull request #25227 from nmadhok/doc-fix
...
Changing the way links look on the index page
2015-07-08 08:57:28 -06:00
Mike Place
5db000d9ca
Merge pull request #25222 from rallytime/bp-25219
...
Back-port #25219 to 2015.8
2015-07-08 08:55:17 -06:00
Dmitry Kuzmenko
ca233e56e5
RunnerClient support old style commands with kwargs on top level.
...
1. Use low['args'] low['kwargs'] if specified and not empty in the low data.
2. Lookup root level and set kwargs in low data if missing.
2015-07-08 17:53:46 +03:00
Dmitry Kuzmenko
96ab4e1607
Revert "Fixed GET /jobs/<id> requests"
...
This reverts commit 954ba6eba9
2015-07-08 17:53:46 +03:00
Rafael Uzarowski
62b6d4faef
Make SourceDestCheck flag available to network interface definition
2015-07-08 16:44:59 +02:00
Pedro Algarvio
c0be10a979
Merge pull request #25232 from s0undt3ch/develop
...
Merge 2015.8 forward to develop
2015-07-08 14:57:50 +01:00
Chris Reeves
3da8d7e290
Fixed bug with argument passing from boto_asg state to boto_asg module
...
Specifically updating an existing auto scale group passed positional
arguments to keyword arguments resulting in the wrong arguments
end up in the wrong place in the module call.
2015-07-08 14:08:12 +01:00
Pedro Algarvio
39c1e32f47
Merge remote-tracking branch 'upstream/2015.8' into develop
2015-07-08 11:47:25 +01:00
Paul Sellars
6dbaab32f9
[25230] Change LXC version to come from lxc-info
...
Fix for:
https://github.com/saltstack/salt/issues/25230
Seems lxc-ls isn't reliable to get a version, it 'may' return a version if there is already a container created, but from a blank state there's nothing coming back.
2015-07-08 11:02:39 +01:00
Arthur Lutz
82ef59dbd0
pylint fix
2015-07-08 09:11:46 +02:00
Nitin Madhok
d6d62c1160
Changing the way links look on the index page
2015-07-08 02:54:52 -04:00
Nitin Madhok
02c4ef653f
Forgot to correct the spelling
2015-07-08 02:25:41 -04:00
Nitin Madhok
331b27712c
Backporting fix for issue #25223 on 2015.8 branch
2015-07-08 02:24:29 -04:00
Nitin Madhok
a1c4eaddd5
Fixing issue which caused Runtime Errors because of changing the list which is being looped over. Fixes #25223
2015-07-08 02:14:15 -04:00
Jacob Hammons
0a46dc4c40
Built man page for spm, added man page entry for spm to doc/conf.py
...
Refs #25213
2015-07-07 20:48:58 -06:00
Nicole Thomas
49b249e9b6
Merge pull request #25219 from jacobhammons/spm-man-page
...
Built man page for spm, added man page entry for spm to doc/conf.py
2015-07-07 20:46:52 -06:00
Jacob Hammons
98d7867957
Built man page for spm, added man page entry for spm to doc/conf.py
...
Refs #25213
2015-07-07 16:54:26 -06:00
Thomas S Hatch
2b02315d73
Merge pull request #25198 from cbuehler/patch-2
...
extend return on error to enable usage with salt.states.module
2015-07-07 12:27:09 -06:00
Thomas S Hatch
b781b595fa
Merge pull request #25200 from geneseven/develop
...
solve the issue of add_host. If the name had already one more recored…
2015-07-07 12:26:10 -06:00
Thomas S Hatch
ca2e55abd8
Merge pull request #25209 from wcbzero/develop
...
Fixed bug report link. Old link was 404
2015-07-07 12:24:35 -06:00
Thomas S Hatch
ed5c788dcd
Merge pull request #25197 from kottenator/patch-1
...
Update salt/auth/pki.py
2015-07-07 12:19:20 -06:00
Mike Place
6fe7ebd583
Merge pull request #25188 from rallytime/linode_logs
...
Use linode status descriptions instead of ints when logging status to CLI
2015-07-07 11:08:02 -06:00
Bill Britt
8c7ec4a4bd
Fixed bug report link. Old link was 404
2015-07-07 09:36:14 -07:00
Mike Place
1b2d43806c
Merge pull request #25203 from s0undt3ch/features/raas-17-salt-cloud-2015.8
...
Added DictConfig with tests & More tests
2015-07-07 10:32:52 -06:00
Mike Place
cebf56c870
Merge pull request #25204 from viktorkrivak/develop
...
Fix list render in apache
2015-07-07 10:31:40 -06:00
Mike Place
c7328c0f67
Merge pull request #25208 from techhat/spmdocs
...
Should be FORMULA, not FORMULA.yml
2015-07-07 10:31:05 -06:00
