Nicole Thomas
34e0cab774
Merge pull request #20228 from rallytime/pylinting
...
Pylint fix for 2015.2
2015-01-29 16:37:10 -07:00
rallytime
cabf5ffd5d
Pylint fix for 2015.2
2015-01-29 16:36:27 -07:00
Nicole Thomas
6e8e3917b3
Merge pull request #20219 from rallytime/backport_19829
...
Backport #19829 to 2015.2
2015-01-29 15:24:56 -07:00
Nicole Thomas
1632553c23
Merge pull request #20215 from rallytime/bp-19566
...
Backport #19566 to 2015.2
2015-01-29 15:24:16 -07:00
Nicole Thomas
cfaba40f4b
Merge pull request #20214 from rallytime/merge_forward_fifteen_second_try
...
Merge forward fifteen second try
2015-01-29 15:09:53 -07:00
Nicole Thomas
738a7c8c44
Merge pull request #20209 from rallytime/bp-20166
...
Backport #20166 to 2015.2
2015-01-29 14:29:02 -07:00
Alexander Haase
203b700032
Another pass over modules/mount.py against pylint....
2015-01-29 14:13:19 -07:00
Alexander Haase
5c5d123bc8
Another pass over modules/mount.py against pylint....
2015-01-29 14:13:14 -07:00
Alexander Haase
f3eba17d43
More pylint fixes for changes to modules/mount.py
2015-01-29 14:13:07 -07:00
Alexander Haase
da75fa8ce0
PEP style compliance for changes to states/mount.py
2015-01-29 14:13:02 -07:00
Alexander Haase
61a0421adc
PEP style compliance for changes to modules/mount.py
2015-01-29 14:12:41 -07:00
Alexander Haase
ba1dcb972b
Updating modules/mount.py (mount.fstab) to produce an array for opts, rather than the opts string literal. Allows mount to pass unit tests
2015-01-29 14:12:35 -07:00
Alexander Haase
02cc8bb631
Fixed whitespace error, ran unit tests
2015-01-29 14:12:28 -07:00
Alexander Haase
9b1caf6b42
Normalizing white space to four spaces to remedy pylint errors
2015-01-29 14:12:21 -07:00
Alexander Haase
61250467e4
Debugged & moderately tested match_on functionality for modules/mount and states/mount with relation to fstab.
2015-01-29 14:12:14 -07:00
Alexander Haase
3fd2e254f9
Debugged & moderately tested match_on functionality for modules/mount and states/mount with relation to fstab.
2015-01-29 14:12:06 -07:00
Alexander Haase
ec0e4d328d
Adding rework for mount match-on criteria. Implimented core class in mount/modules to represent and match fstab entries. Re-implimented related methods in DRY compliance.
2015-01-29 14:11:48 -07:00
rallytime
9db1a61165
Pylint fix
2015-01-29 13:51:13 -07:00
Flavian
fb2377c076
#19162 added disks to Azure VM creation. Only new empty disks are
...
supported. Add a line
volumes:
- { size: 10 (default 100), lun: [0-15](default: 0), disk_label:
<label>(default: <role-name>-disk-<lun>) }
2015-01-29 13:48:48 -07:00
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
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
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
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
d04999d741
Merge pull request #20163 from jfindlay/fix_sysctl
...
fix sysctl test state comparison
2015-01-29 10:29:46 -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
Joseph Hall
115c2068b0
Allow writing decoded data to file
2015-01-29 10:07:38 -07: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
Flavian
f5fb1f758e
Fixing pylint errors
2015-01-29 10:36:29 +01: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
Mathieu Le Marec - Pasquet
42196ca827
Rework a bit the runner completion log
2015-01-28 18:43:44 -08:00
Mathieu Le Marec - Pasquet
3040255242
Removing useless cruft
2015-01-28 18:43:44 -08:00
Mathieu Le Marec - Pasquet
1b09aa3e58
runner: unclutter the output from mminion loading
2015-01-28 18:43:44 -08:00
Mathieu Le Marec - Pasquet
65093635f3
runner: Fix job store
2015-01-28 18:43:44 -08:00
