rallytime
c65d9673a7
Merge branch '2014.7' into merge_forward_fifteen_second_try
...
Conflicts:
salt/states/file.py
2015-01-29 13:42:49 -07:00
Mike Place
449e991e76
Add username/password to expected args
...
Fixes many broken netapi functions, such as wheel.key.list_all
2015-01-29 13:41:22 -07:00
Nicole Thomas
4aeaec7a94
Merge pull request #20212 from saltstack/revert-20156-bp-19566
...
Revert "Backport #19566 to 2014.7"
2015-01-29 13:40:13 -07:00
Nicole Thomas
9fef292d3d
Revert "Backport #19566 to 2014.7"
2015-01-29 13:39:58 -07:00
Mike Place
325af0f674
Catch all exceptions in reactor
...
There is a possible bug wherein uncaught exceptions seem to make zmq3
tip over when threading is involved. This is an attempt to prevent that
from happening. (The cause of the exceptions will need to be
investigated as well, most specifically wheel.key)
2015-01-29 12:53:18 -07:00
Nicole Thomas
bf9c989858
Merge pull request #20178 from jacksontj/saltnado
...
Saltnado performance improvements
2015-01-29 12:42:54 -07:00
Mathieu Le Marec - Pasquet
b00fd8ea1e
lint
2015-01-29 20:27:07 +01:00
Thomas Jackson
8ea041b0ca
Massive speedup to saltnado
...
This mixin was creating 3 localclients and 1 runner client per request-- which takes ~6s. Now we build the set of clients once per process
2015-01-29 10:32:58 -08:00
C. R. Oldham
d3524e9291
Merge pull request #20200 from techhat/decodeout
...
Allow writing decoded data to file
2015-01-29 11:00:10 -07:00
Thomas S Hatch
aae6a340d8
Merge pull request #20192 from Trax-air/azure-async
...
Raises an exception when something goes wrong with VM creation
2015-01-29 10:41:47 -07:00
Thomas S Hatch
1fc9a52ead
Merge pull request #20186 from makinacorpus/f
...
Add a compat layer on zc.buildout state.
2015-01-29 10:40:14 -07:00
Thomas S Hatch
50aeea25a2
Merge pull request #20183 from jayeshka/htpasswd-unit-test
...
adding htpasswd unit test case
2015-01-29 10:39:55 -07:00
Thomas S Hatch
6a6bc56958
Merge pull request #20181 from jayeshka/hipchat-unit-test
...
adding hipchat test case
2015-01-29 10:39:36 -07:00
Thomas S Hatch
9698e49930
Merge pull request #20180 from jayeshka/guestfs-unit-test
...
adding guestfs unit test case
2015-01-29 10:39:20 -07:00
Thomas S Hatch
a525c43e9b
Merge pull request #20179 from russellballestrini/hg-identity-refactor
...
Added hg identity argument to state and module
2015-01-29 10:38:43 -07:00
Thomas S Hatch
11dad072b3
Merge pull request #20177 from techhat/httpupdate
...
Don't default CA bundle updates to a non-standard location
2015-01-29 10:35:56 -07:00
Thomas S Hatch
eb19ccd99e
Merge pull request #20174 from kim0/freebsd-status.meminfo
...
Implement freebsd-status.meminfo
2015-01-29 10:34:38 -07:00
Joseph Hall
d93f433843
Linting
2015-01-29 10:33:17 -07:00
Thomas S Hatch
b469df1b28
Merge pull request #20172 from jacksontj/develop
...
Fix for #20170
2015-01-29 10:32:38 -07:00
Thomas S Hatch
504cbd97c6
Merge pull request #20171 from plastikos/develop
...
Minor: Improve thin and shim warnings and comments.
2015-01-29 10:31:00 -07:00
Thomas S Hatch
d04999d741
Merge pull request #20163 from jfindlay/fix_sysctl
...
fix sysctl test state comparison
2015-01-29 10:29:46 -07:00
Mike Place
d6250e9206
Merge pull request #20202 from cachedout/log_flaky_zmq_test
...
Add some logging to flaky test
2015-01-29 10:29:39 -07:00
Thomas S Hatch
b6983e755c
Merge pull request #20086 from jacksontj/2015.2
...
2015.2: Runner compatibility
2015-01-29 10:29:08 -07:00
Mike Place
d772ddb2bf
Add some logging to flaky test
...
We need to see what's happening in the echo server to figure out why
this occasionally fails.
2015-01-29 10:27:31 -07:00
Joseph Hall
115c2068b0
Allow writing decoded data to file
2015-01-29 10:07:38 -07:00
Mathieu Le Marec - Pasquet
8cbeeff3df
Lint
2015-01-29 17:40:51 +01:00
Thomas Jackson
f2b3c1657e
Lazily load functions, since lots of clients don't even execute runners
2015-01-29 07:44:10 -08:00
Joseph Hall
03deef181b
Merge pull request #20168 from Trax-air/fix-volumes-azure
...
Fix volumes azure
2015-01-29 07:45:43 -07:00
Flavian
920c1f6eb2
Replace " by '
2015-01-29 15:23:14 +01:00
Flavian
fc1053e7ee
Raises a more meaningful exception
2015-01-29 14:41:09 +01:00
Flavian
cef090cc6c
Added _wait_for_async for asynchronous operations
2015-01-29 14:28:22 +01:00
Jayesh Kariya
0b1bade648
resolved the error
2015-01-29 16:00:21 +05:30
Mathieu Le Marec - Pasquet
8a99dc4af5
Add a compat layer on zc.buildout state.
...
This fixes #20184
2015-01-29 11:11:32 +01:00
Flavian
f5fb1f758e
Fixing pylint errors
2015-01-29 10:36:29 +01:00
Jayesh Kariya
8cedb4b71d
adding htpasswd unit test case
2015-01-29 14:49:32 +05:30
Jayesh Kariya
2ab996d135
adding hipchat test case
2015-01-29 14:25:25 +05:30
Jayesh Kariya
acf1f5ffc6
adding guestfs unit test case
2015-01-29 14:18:38 +05:30
Thomas Jackson
c89262c758
Lazily load functions, since lots of clients don't even execute runners
2015-01-28 20:20:15 -08:00
Russell Ballestrini
eaf87e63ec
modified: salt/modules/hg.py
2015-01-28 23:14:30 -05:00
Cimarron Mittelsteadt
acaafda038
BUG: Removed extra quotes in hg.clone (not needed as cmd is already split as list) which was causing hg to abort on non-local repos like "ssh://...."
2015-01-28 23:06:39 -05:00
Russell Ballestrini
3763e056f2
Added hg identity argument to state and module
...
We now support supplying a private SSH key path for authentication.
modified: salt/modules/hg.py
modified: salt/states/hg.py
2015-01-28 22:57:50 -05:00
Joseph Hall
f5e8b4a10e
Don't default CA bundle updates to a non-standard location
2015-01-28 20:09:13 -07:00
Thomas Jackson
dd045dfc9f
Massive speedup to saltnado
...
This mixin was creating 3 localclients and 1 runner client per request-- which takes ~6s. Now we build the set of clients once per process
2015-01-28 19:00:35 -08:00
Thomas Jackson
4285d10d97
Fixup some merge conflicts from the backport
2015-01-28 18:43:45 -08:00
Thomas Jackson
1101f70715
Lazily load masterminion and keep it around.
2015-01-28 18:43:45 -08:00
Thomas Jackson
3d1ae49d09
Pass opts not an ImmutableDict of opts
2015-01-28 18:43:45 -08:00
Thomas Jackson
dad5b11600
Fix typo from 37619f0e
2015-01-28 18:43:45 -08:00
Thomas Jackson
69d4fac58b
Migrate docs runner to __jid_event__
2015-01-28 18:43:45 -08:00
Thomas Jackson
8171574646
Already prints out the output if run in sync mode, and async already has this in the ret event
2015-01-28 18:43:44 -08:00
Thomas Jackson
852fbfdbe2
Misc style cleanup
2015-01-28 18:43:44 -08:00
