Thomas S Hatch
aa84367d01
Merge pull request #19331 from Basis/data.p-race-condition
...
Write to temp file then move to data.p to avoid race condition
2015-01-06 09:39:47 -07:00
Elias Probst
febfc17270
Correct doc
2015-01-06 16:27:07 +01:00
Antoine Jacoutot
113c56a8da
openbsdrcctl: fix code to match new rcctl(8) syntax.
2015-01-06 16:23:11 +01:00
vs
d74e7eb33f
improve master.status to work with host fqdns/hostnames as well as ips
...
The former version only worked with IPs which is kind of limited and
has been reported as bugs.
2015-01-06 10:09:32 +01:00
robert.fach
d6389c8e1c
fixed identation problem
2015-01-06 09:42:17 +01:00
Jayesh
508ec1adea
removed pylint error in augeas_cfg unit test case
2015-01-06 11:49:48 +05:30
Jayesh
2edf731c97
adding augeas_cfg unit test case
2015-01-06 11:19:36 +05:30
Lance Linder
cf9bc435c5
Fixed undefined data variable in s3 utils
2015-01-05 23:46:02 -06:00
Joseph Hall
adbcb96c09
Merge pull request #19315 from Melrok/fix-salt-cloud-volumes
...
Fix salt cloud volumes
2015-01-05 21:02:18 -07:00
Chris Rebert
5304e272c2
rename log setup funcs for PEP8 compliance
2015-01-05 17:59:45 -08:00
Chris Rebert
12b4260709
minor cleanup of Django auth
2015-01-05 17:56:16 -08:00
Thomas Jackson
687012b6c5
Pop "aes" from the opts before passing to ext_pillar modules
...
We should probably not put "aes" in the global opts dict, but rather as a class attribute of auth/crypticle or something
2015-01-05 17:23:24 -08:00
Thomas Jackson
d226ebbf43
Pylint cleanup
2015-01-05 17:23:19 -08:00
sjwehry
8eb6de4e09
fixed typo in tests/consist.py
...
fixed typo in tests/consist.py
2015-01-05 20:01:16 -05:00
Elias Probst
6979767cd3
Add 'actimeo' to the invisible mount options
2015-01-06 01:54:35 +01:00
Elias Probst
c653d90ad4
Add 'intr' and 'retry' to the invisible mount options
2015-01-06 01:54:35 +01:00
Elias Probst
5ecf4bb19a
Generalize the approach used for 'comment_option' to allow arbitrary key-value options.
2015-01-06 01:54:35 +01:00
Elias Probst
69adc58903
Sort options alphabetically.
2015-01-06 01:54:35 +01:00
Elias Probst
50b817a070
The 'mount_invisible_options' list grew too long. Split it into 1 option per line.
2015-01-06 01:54:35 +01:00
Elias Probst
2966d0e2c6
Add '_netdev' to the invisible mount options
2015-01-06 01:54:34 +01:00
Elias Probst
739b7c2127
Add 'soft' to the invisible mount options
2015-01-06 01:54:34 +01:00
Elias Probst
42684fb279
Add 'bg' to the invisible mount options
2015-01-06 01:54:29 +01:00
root
9993366d70
Changed from using type() to isinstance() per pull request comment
2015-01-06 00:11:26 +00:00
rallytime
d8667fbd74
freebsd_sysctl module python shell kwarg additons
2015-01-05 16:53:28 -07:00
rallytime
73a2525f5b
freebsdservice module python shell kwarg additions
2015-01-05 16:51:50 -07:00
rallytime
a0501ecdeb
extfs module python shell kwarg additions
2015-01-05 16:46:56 -07:00
rallytime
d84e0412aa
dpkg module python shell kwarg additions
2015-01-05 16:41:13 -07:00
rallytime
842d345ad8
django module python_shell=False additions
2015-01-05 16:36:12 -07:00
rallytime
c08939a755
disk module python_shell=False addition
2015-01-05 16:34:20 -07:00
rallytime
4034e66acb
debconfmod module python_shell=False addition
2015-01-05 16:29:03 -07:00
Mike Place
bf96eeecb8
Merge pull request #19367 from cachedout/msgpack_2014_7
...
Fix occasional critical error on console
2015-01-05 16:27:55 -07:00
Mike Place
fa64450fea
Fix occasional critical error on console
2015-01-05 16:27:14 -07:00
rallytime
603ba43bcd
daemontools module python_shell=False additions
2015-01-05 16:26:14 -07:00
rallytime
515252b2b9
composer module python_shell=False additon
2015-01-05 16:22:58 -07:00
Mike Place
ef567a9309
Fix typo in jboss7 module.
...
Closes #18598
2015-01-05 15:57:09 -07:00
rallytime
199f4e04f2
brew module python_shell=False addition
2015-01-05 15:56:07 -07:00
rallytime
ba82cce8a2
blockdev module python_shell=False addition
2015-01-05 15:53:58 -07:00
Mike Place
eb6fd3d538
Merge pull request #19361 from jfindlay/ensure_cmds
...
make some command contexts explicit
2015-01-05 15:49:13 -07:00
Mike Place
7ef0de5f05
Merge pull request #19363 from rallytime/fix_dot_seven_test
...
Fix dot seven test
2015-01-05 15:38:39 -07:00
rallytime
f6243f0b80
Fix the test in the correct place...
2015-01-05 15:36:45 -07:00
rallytime
4a62c2b860
Fix pip state test failure
2015-01-05 15:20:18 -07:00
Pedro Algarvio
927290ff44
Merge pull request #19359 from rallytime/pylint_fix
...
Pylint fix for develop
2015-01-05 22:20:13 +00:00
Justin Findlay
726eb220b2
ensure archive commands
2015-01-05 14:57:20 -07:00
Justin Findlay
0927a7539e
ensure grain commands
2015-01-05 14:57:20 -07:00
rallytime
6d26bd4c0c
Pylint fix for develop
2015-01-05 14:42:03 -07:00
Christophe Fonteyne
aea2188f56
Update states/augeas.py. Fix index error.
...
When specifying the test parameter, you get the error:
Function: augeas.change
Result: False
Comment: An exception occurred in this state: Traceback (most recent call last):
File "/usr/lib/python2.6/site-packages/salt/state.py", line 1533, in call
**cdata['kwargs'])
File "/usr/lib64/python2.6/contextlib.py", line 34, in __exit__
self.gen.throw(type, value, traceback)
File "/usr/lib/python2.6/site-packages/salt/utils/context.py", line 41, in func_globals_inject
yield
File "/usr/lib/python2.6/site-packages/salt/state.py", line 1533, in call
**cdata['kwargs'])
File "/usr/lib/python2.6/site-packages/salt/states/augeas.py", line 170, in change
ret['comment'] += ' in file {1}:\n'.format(context)
IndexError: tuple index out of range
This change fixes the issues and provides better output.
2015-01-05 14:36:30 -07:00
rallytime
0c4e2f0b2b
Pylint fix for backport
2015-01-05 14:34:48 -07:00
Nassim KACHA
334bed550c
Fixed the function user_list of mongodb module to work properly with MongoDB 2.6
2015-01-05 14:32:58 -07:00
Nassim KACHA
47ecb134a8
Fixed the function user_list of mongodb module to work properly with MongoDB 2.6
2015-01-05 14:32:57 -07:00
Nitin Madhok
f20f899b34
Changing return to match zpool list instead of zfs list
2015-01-05 14:05:55 -07:00
