valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
45,011 Commits 24 Branches 182 Tags 341 MiB
e26ff89956
Commit Graph

45011 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Jackson
064b8981bc Remove various AES sanitization attempts. 2015-01-29 18:10:56 -08:00
Thomas Jackson
6439ad9db9 Move AES key out of opts. 
This way we can avoid accidently passing it all sorts of places it shouldn't be.

I'm doing something similar in my transport overhaul, so this will match more with that.
 2015-01-29 18:08:52 -08:00
Seth House
23745daa55 Replaced HTTP examples with HTTPS 
Lead by example!
 2015-01-29 18:36:01 -07:00
Seth House
538e80af04 Added a note about recommended CherryPy versions due to SSL errors 2015-01-29 18:32:01 -07:00
Seth House
8a74d90813 Added a better explanation of lowdata and more examples 2015-01-29 18:32:01 -07:00
Seth House
60c2959ef5 Added two authentication examples to rest_cherrypy docs 2015-01-29 18:32:00 -07:00
Joseph Hall
7b8e852995 Fix syntax error 2015-01-29 18:10:22 -07:00
Colton Myers
1b13d4d8b5 Check for terminated (errored) processes in salt-ssh 
Fixes #20223
 2015-01-29 17:26:08 -07:00
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
8598559bfd Merge pull request #20210 from rallytime/bp-20171 
Backport #20171 to 2014.7
 2015-01-29 16:26:57 -07:00
Justin Findlay
b40fedcc55 extend a list not a tuple 
fixes #20224
 2015-01-29 16:01:26 -07:00
Joseph Hall
b3f2606f8f Use syspaths, in a proper file_roots structure 2015-01-29 15:44:33 -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
a72017d516 Merge pull request #20211 from rallytime/bp-20118 
Backport #20118 to 2014.7
 2015-01-29 15:08:16 -07:00
rallytime
132f364e10 Don't use salt.defaults.exitcodes, just use salt.exitcodes in 2014.7 2015-01-29 15:04:26 -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
Thomas S Hatch
8a8b8e8fbb Don't need a python shell 2015-01-29 14:14:11 -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
Joseph Hall
d63b7a7db2 Switch fileclient to salt.utils.http.query() 2015-01-29 13:54:25 -07:00
Thomas S Hatch
02c8115a46 IT WORKS!! 2015-01-29 13:51:21 -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
vs
c8f734b909 improved status.master to work with fqdns 2015-01-29 21:44:52 +01: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
Thomas S Hatch
e336dc1e0e Add sudo_user logic to zmq side 2015-01-29 13:36:18 -07:00
Thomas S Hatch
89408bfb01 salt.utils.which... 2015-01-29 13:02:26 -07:00
kitsemets
d6e70fdf9d salt.states.cmd: fixed 'unless' behaviour in case of multiple unless commands are given 2015-01-29 13:00:18 -07:00
Thayne Harbaugh
80dc5aedd7 Minor: Improve thin and shim warnings and comments. 2015-01-29 12:58:14 -07:00
Thomas S Hatch
d47f88bdd5 initial hook for sudo_user execution on the minion 2015-01-29 12:57:40 -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
Thomas S Hatch
c2487c0e75 initial sudo module 2015-01-29 12:27:42 -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
root
60d6a09371 Changed from using type() to isinstance() per pull request comment 2015-01-29 10:57:14 -07:00
Shad Nygren
7807971351 Fix AttributeError: 'list' object has no attribute 'items' in cloud.py run_func_until_ret_arg() 2015-01-29 10:57:00 -07:00
Colton Myers
8f322c96c6 Iterate over the shortopts if there are more than one 
Fixes #20195
 2015-01-29 10:46:31 -07:00