Thomas Jackson
79516222cc
Fix for #20170
...
fix bug introduced in e806ae98fc
2015-01-28 16:44:05 -08:00
Thomas S Hatch
28b584a595
Merge pull request #20133 from gweis/develop
...
webutil.useradd throws exception KeyError: 'out'
2015-01-28 15:43:28 -07:00
Mike Place
64ced62848
Merge pull request #20166 from cachedout/reactor_exc_catch
...
Catch all exceptions in reactor
2015-01-28 15:28:46 -07:00
Mike Place
cd2aa33d8c
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-28 15:22:58 -07:00
Thomas S Hatch
04288b341d
Merge pull request #20161 from cachedout/api_runner_defaults
...
Init default args/kwargs if none are supplied in netap
2015-01-28 15:05:50 -07:00
Thomas S Hatch
29ac504a93
Merge pull request #20142 from quantonganh/tls-module-cert-extensions
...
Allow to add extensions to a certificate
2015-01-28 14:59:58 -07:00
Thomas S Hatch
7cb71df473
Merge pull request #20134 from gerl1ng/extend-mysql-state-documentation
...
Extended mysql_user and mysql_grants documentation
2015-01-28 14:57:43 -07:00
Thomas S Hatch
89d47feb04
Merge pull request #20118 from kitsemets/fix-unless-in-cmd-state
...
salt.states.cmd: fixed 'unless' behaviour in case of multiple commands are given
2015-01-28 14:49:26 -07:00
Thomas S Hatch
54c472bf3a
Merge pull request #20099 from matyunin/develop
...
Code block start comment typo
2015-01-28 14:47:29 -07:00
Thomas S Hatch
f71714f212
Merge pull request #19729 from jacksontj/develop
...
Runner compatibility
2015-01-28 14:29:42 -07:00
Mike Place
b4c5b4fc94
Init default args/kwargs if none are supplied in netap
2015-01-28 14:10:15 -07:00
Nicole Thomas
16da23c5e7
Merge pull request #20139 from jayeshka/drbd-unit-test
...
adding drbd unit test case
2015-01-28 12:40:58 -07:00
Nicole Thomas
77e71fdd6e
Merge pull request #20127 from cachedout/doc_outputter
...
Use the nested outputter to display docs with -d
2015-01-28 12:32:43 -07:00
Nicole Thomas
5b8dd2a1f1
Merge pull request #20153 from rallytime/merge_20144
...
Merge #20144 with pylint fix
2015-01-28 12:16:24 -07:00
Nicole Thomas
be9cac8fd1
Merge pull request #20146 from rupeshta/key_unit_tests
...
implemented unit test cases for key module
2015-01-28 12:13:00 -07:00
rallytime
ec7ece47ca
Whitespace fix
2015-01-28 12:09:33 -07:00
Nicole Thomas
cfe10ed9d6
Merge pull request #20140 from jayeshka/glusterfs-unit-test
...
adding glusterfs unit test case
2015-01-28 08:58:58 -07:00
Mike Place
2ee0118e1f
Merge pull request #20147 from cachedout/fix_sed_tests
...
Fix sed test
2015-01-28 06:33:23 -07:00
Mike Place
3dcc41de39
Fix sed test
2015-01-28 06:30:39 -07:00
Rupesh Tare
ac4dd17c95
implemented unit test cases for key module
2015-01-28 18:42:31 +05:30
pille
1967888007
fix doc cli markup
2015-01-28 12:17:45 +01:00
quanta
91aa68603f
Allow to add extensions to a certificate
2015-01-28 16:26:14 +07:00
Mikhail Matyunin
91200a25e6
Remove breaking "Static" word on line 647
2015-01-28 10:18:32 +03:00
Jayesh Kariya
1718a96d3b
adding glusterfs unit test case
2015-01-28 11:30:47 +05:30
Jayesh Kariya
3eda02a5e8
adding drbd unit test case
2015-01-28 11:28:15 +05:30
Mike Place
6bb599bc30
Merge pull request #20130 from cachedout/fix_fstab
...
Quote strs
2015-01-27 20:10:37 -07:00
Marius Gerling
71e20675a0
Extended mysql_user and mysql_grants documentation
...
It was hard to figure out, how to set the password for a new
permission allowing the user to log in from another host. mysql_user is
the right state for this. I crosslinked the documentations of both
states. So the information will be found easier by others.
2015-01-28 01:33:30 +01:00
gweis
6d1d0a404f
webutil.useradd throws exception KeyError: 'out'
...
return dictionary from cmd.run_all directly.
2015-01-28 10:14:55 +10:00
Mike Place
ba37d40d26
Quote strs
2015-01-27 16:00:44 -07:00
Mike Place
845a7bf237
Use the nested outputter to display docs with -d
2015-01-27 15:29:26 -07:00
Mike Place
a5e0137b01
Merge pull request #20126 from cachedout/fix_debian_ip
...
Check for empty hostname
2015-01-27 14:59:53 -07:00
Mike Place
a213563a9e
Check for empty hostname
2015-01-27 14:59:17 -07:00
Nicole Thomas
401f94934c
Merge pull request #20114 from jfindlay/fix_ddns_tests
...
fix ddns_test for py26, broken for py3
2015-01-27 14:56:31 -07:00
Thomas S Hatch
1a1fe2355f
Merge pull request #20123 from cvrebert/patch-4
...
etcd_return.get_load(): fix str.join() call
2015-01-27 14:33:29 -07:00
Thomas S Hatch
e736adffa3
Merge pull request #20122 from cvrebert/patch-3
...
mount.set_fstab: don't use vars()
2015-01-27 14:33:01 -07:00
Justin Findlay
b178ee10c2
lint fixes
2015-01-27 14:32:29 -07:00
Justin Findlay
41dd3307dc
fix ddns_test for py26, broken for py3
...
The way to fix this for py26+py3 compatibility is probably to create a
wrapper for contextlib.nested in something like
salt.utils.contextlib.nested or salt.utils.py3_compat.contextlib.nested.
2015-01-27 14:32:29 -07:00
Mike Place
2fc1452be6
Merge pull request #20125 from cachedout/pydsl_copy
...
Avoid file cache problem in pydsl tests
2015-01-27 14:32:21 -07:00
Mike Place
dc538853c6
Avoid file cache problem in pydsl tests
...
Using the same copy of opts was causing the cache refresh to not find
any files because they had already been cleaned up!
2015-01-27 14:30:56 -07:00
Chris Rebert
088a82236f
etcd_return.get_load(): fix str.join() call
...
************* Module salt.returners.etcd_return
salt/returners/etcd_return.py:121: [E1121(too-many-function-args), get_load] Too many positional arguments for method call
2015-01-27 13:24:06 -08:00
Thomas S Hatch
9ba6d44be9
Merge pull request #20121 from cvrebert/patch-2
...
grains.ssds: rm redundant import
2015-01-27 14:24:04 -07:00
Chris Rebert
7af1865572
mount.set_fstab: don't use vars()
2015-01-27 13:20:08 -08:00
Joseph Hall
d783dd2358
Merge pull request #20117 from cvrebert/patch-1
...
utils.verify.verify_env(): fix "defulats" typo
2015-01-27 14:19:33 -07:00
Chris Rebert
c3b1725268
grains.ssds: rm redundant import
...
************* Module salt.grains.ssds
salt/grains/ssds.py:13: [W0404(reimported), ] Reimport 'salt.utils' (imported line 9)
2015-01-27 13:13:44 -08:00
Thomas Jackson
bfae9f9de5
Lazily load masterminion and keep it around.
2015-01-27 13:11:14 -08:00
Thomas Jackson
4db02487f1
Pass opts not an ImmutableDict of opts
2015-01-27 13:11:01 -08:00
Chris Rebert
55325d52ba
utils.verify.verify_env(): fix "defulats" typo
...
************* Module salt.utils.verify
salt/utils/verify.py:202: [E1101(no-member), verify_env] Module 'salt' has no 'defulats' member
2015-01-27 13:05:26 -08:00
kitsemets
6677a0a13e
salt.states.cmd: fixed 'unless' behaviour in case of multiple unless commands are given
2015-01-27 22:45:50 +02:00
Joseph Hall
b96b852aa1
Merge pull request #20115 from TaiSHiNet/patch-1
...
DO APIv1 issue Closes #19306
2015-01-27 13:18:38 -07:00
TaiSHiNet
19af3303e3
DO APIv1 issue Closes #19306
...
Cast backups_enabled/private_networking booleans to lowercase string, given that DO APIv1 will not recognize True with capitol T
All credits to @namcois, I merely edited the file
2015-01-27 16:38:02 -03:00
