Thomas S Hatch
e3716ab322
Merge pull request #18383 from thatch45/stray_print
...
remove stray print
2014-11-21 15:48:46 -07:00
Thomas S Hatch
590b5a3a56
iremove stray print
2014-11-21 15:44:28 -07:00
Thomas S Hatch
b1e2d289fe
Merge pull request #18366 from thatch45/saltfile_parser
...
Get non standard saltfile opts into opts
2014-11-21 13:58:55 -07:00
Thomas S Hatch
be35e1cef8
Merge pull request #18367 from thatch45/sdecode
...
initial sdicode function
2014-11-21 13:21:03 -07:00
Thomas S Hatch
5a895fb85b
disable lint error
2014-11-21 13:18:35 -07:00
Thomas S Hatch
bc2f0f8995
unicide, prevent returning None
2014-11-21 12:08:24 -07:00
Thomas S Hatch
f59f193374
get the right locale
2014-11-21 12:05:22 -07:00
Thomas S Hatch
38b1ca05af
make the encodings list more robust
2014-11-21 12:03:15 -07:00
Thomas S Hatch
a9577b2e82
initial sdicode function
2014-11-21 11:49:32 -07:00
Thomas S Hatch
1bfc9c6198
Add extra_filerefs to salt-ssh options
2014-11-21 11:12:07 -07:00
Thomas S Hatch
6fd2389e58
Add non standard opts into saltfile
2014-11-21 10:58:59 -07:00
Thomas S Hatch
481a52c03f
Fix part 1 of #18353
2014-11-21 10:26:41 -07:00
Thomas S Hatch
c02e2e9135
Merge pull request #18281 from cro/mdadm_update
...
Properly quote parameters to mdadm
2014-11-21 10:14:09 -07:00
Thomas S Hatch
3b91d96e9d
Merge pull request #18364 from thatch45/nacl_check
...
check for the OSError that libnacl might throw if libsodium is no here
2014-11-21 09:50:33 -07:00
Thomas S Hatch
59feb4ddfc
check for the OSError that libnacl might throw if libsodium is no here
2014-11-21 09:49:04 -07:00
Thomas S Hatch
1af14920a8
Merge pull request #18350 from thatch45/key_race
...
Fix key gen race condition, fix #17289
2014-11-21 09:40:42 -07:00
Thomas S Hatch
5e41adfa80
Merge pull request #18349 from rallytime/bp-18049
...
Backport #18049 to 2014.7
2014-11-21 09:40:21 -07:00
Thomas S Hatch
dc672d9114
Merge pull request #18348 from thatch45/unpriv_jid
...
Fix error with perm denial on unpriv job lookups
2014-11-21 09:40:07 -07:00
Thomas S Hatch
c5d3d421b4
don't need the pass
2014-11-21 09:39:49 -07:00
Thomas S Hatch
b2350884d9
Merge pull request #18347 from rallytime/bp-17706
...
Backport #17706 to 2014.7
2014-11-21 09:38:55 -07:00
Thomas S Hatch
c7b9af2654
Merge pull request #18346 from jfindlay/quote_rvm
...
quote shell strs in rvm mod
2014-11-21 09:38:49 -07:00
Thomas S Hatch
b55fe1b4df
Merge pull request #18344 from cachedout/pyenv_quote
...
quote pyenv
2014-11-21 09:38:24 -07:00
Thomas S Hatch
ed3851c156
Merge pull request #18340 from cachedout/pecl_quote
...
quote pecl
2014-11-21 09:37:09 -07:00
Thomas S Hatch
fafe2f4daa
Merge pull request #18336 from wuxxin/2014.7
...
fixes #18331
2014-11-21 09:36:31 -07:00
Thomas S Hatch
8b2787b9a9
Merge pull request #18332 from cachedout/vmadm_quote
...
fix args
2014-11-21 09:36:21 -07:00
Nicole Thomas
bc5f4c3e80
Merge pull request #18328 from jacksontj/2014.7
...
Change all saltnado asserts to unittest asserts.
2014-11-20 20:27:19 -07:00
Thomas Jackson
75bf7bd091
pylint fix
2014-11-20 18:35:41 -08:00
Thomas Jackson
0a1b88e6b5
Change all saltnado asserts to unittest asserts. This way when there is a failure you get nice pretty printouts!
2014-11-20 18:35:41 -08:00
Pedro Algarvio
6a530e7b89
Merge pull request #18345 from thatch45/tar_fix
...
Always extract when extracting
2014-11-21 00:48:23 +00:00
Thomas S Hatch
beb85d353b
Fix key gen race condition, fix #17289
2014-11-20 16:14:19 -07:00
Adrien "ze" Urban
8e3e2d0fb2
fix: (netbsd)sysctl.persist (state was broken)
...
states/sysctl calls sysctl.persist with config file, regardless of the
OS. *_sysctl do have that parameter, but netbsd_sysctl.
Now, netbsd_sysctl takes a config file with a default value like the
others.
2014-11-20 16:02:14 -07:00
Adrien "ze" Urban
07a2a58089
fix: netbsd_sysctl.persist with new key
...
When the key was not already present in sysctl.conf, the creatin was
still trying to access the (un)matched line groups.
2014-11-20 15:59:21 -07:00
Thomas S Hatch
baeff7ed43
Fix error with perm denial on unpriv job lookups
2014-11-20 15:57:12 -07:00
Alexandre Letourneau
7e5da8e84b
Fixed namespace issue in cloud/clouds/cloudstack.py which was breaking its destroy method
2014-11-20 15:56:27 -07:00
Justin Findlay
175690262a
quote shell strs in rvm mod
2014-11-20 15:41:44 -07:00
Thomas S Hatch
8a674cf795
Always extract when extracting
2014-11-20 15:35:48 -07:00
Mike Place
956c50967d
quote pyenv
2014-11-20 15:21:14 -07:00
Nicole Thomas
180ababb23
Merge pull request #18339 from rallytime/moar_pylint
...
Fix pylint issue in mac_user.py
2014-11-20 15:13:46 -07:00
Thomas S Hatch
49fd6d84ca
Merge pull request #18338 from thatch45/net_fix
...
Fix #18168
2014-11-20 14:32:55 -07:00
Mike Place
5bedb3ba16
set shell
2014-11-20 13:58:15 -07:00
Mike Place
f0fcfcd3f3
quote pecl
2014-11-20 13:53:48 -07:00
rallytime
cf0c570649
Fix pylint issue in mac_user.py
2014-11-20 13:46:17 -07:00
Thomas S Hatch
34be40125c
Fix #18168
...
Change the network lookup to be more robust and find aliases
2014-11-20 13:43:09 -07:00
Nicole Thomas
c7cdc40639
Merge pull request #18333 from whiteinge/doc-arch-rst-fix
...
Fix missing space after colon in architecture doc
2014-11-20 13:41:29 -07:00
Thomas S Hatch
8b5b5af405
Merge pull request #18334 from thatch45/uni_usr
...
fall back to utf-8 if we get a unicode error
2014-11-20 13:00:00 -07:00
Felix Erkinger
016056c430
fixes #18331
2014-11-20 20:03:45 +01:00
Thomas S Hatch
7133c892b9
fall back to utf-8 if we get a unicode error
2014-11-20 11:31:43 -07:00
Seth House
898f1a70c3
Fix missing space after colon in architecture doc
...
Fixes #18134
2014-11-20 12:30:33 -06:00
Mike Place
63289ea90d
fix args
2014-11-20 11:08:25 -07:00
Thomas S Hatch
005faed634
Merge pull request #18301 from jacksontj/2014.7-config
...
Pass timeout for pub() down to channel
2014-11-20 09:38:44 -07:00
