valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
44,161 Commits 24 Branches 182 Tags 341 MiB
5f6af88afb
Commit Graph

44161 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Boucha
c26bf546a9 use unix line endings 2015-01-05 11:20:07 -07:00
David Boucha
473c3accdd Don't cache sreq when using threading 
This stops caching sreq when using threading as well as attempts to make
sure threads are tracked and reaped.

Fixes: 18515
Fixes: 19167
 2015-01-05 11:03:50 -07:00
Nicole Thomas
f01ce36e89 Merge pull request #19340 from nmadhok/zpool-unit-test 
Adding unit tests for salt.modules.zpool
 2015-01-05 10:11:46 -07:00
Gareth J. Greenaway
fe39aade2a Allow the version argument for the pkg state to accept the "latest" as a value. If specified then the latest version available will be installed. Per #19291 2015-01-05 09:05:09 -08:00
Christophe Fonteyne
26151774fd 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 18:04:19 +01:00
Mike Place
f44e46d080 Adjust batch test 2015-01-05 10:04:15 -07:00
Mike Place
cfc76d585e Catch all Django errors and some PEP8 cleanup. 
Django can throw a variety of errors, so we need to catch
Django-specific exceptions instead of just an ImportError.
 2015-01-05 09:41:53 -07:00
robert.fach
2b4caaa45f changed salt call to modules/svn.py svn.export function, added revision field to function call argument list 2015-01-05 16:54:14 +01:00
robert.fach
4cb4c7d6e0 changed salt call to modules/svn.py svn.export function, added revision field to function call argument list 2015-01-05 16:50:24 +01:00
C. R. Oldham
35b82ab6e8 Use salt.ext.six instead of "import six", import it "as six" 2015-01-05 08:06:56 -07:00
Jayesh
e20076691b adding apache unit test case 2015-01-05 15:06:14 +05:30
Tomas Neme
1f8def056f fix docstring 2015-01-05 15:03:41 +08:00
Nitin Madhok
c21c7c96c5 Changing return to match zpool list instead of zfs list 2015-01-04 23:48:30 -05:00
nmadhok
2c53cbec1d Replacing zfs with zpool 2015-01-05 10:04:38 +05:30
Ryne McCall
a0e2f09ec5 Support messages containing non-ascii characters 
This fixes #19338.
 2015-01-04 21:58:07 -05:00
Pedro Algarvio
0452b43af6 Merge pull request #19335 from rallytime/pylint_develop 
Fix develop pylint
 2015-01-04 11:56:20 +00:00
rallytime
fb9bc7de94 Fix develop pylint 2015-01-03 22:02:41 -07:00
Nicole Thomas
06795221be Merge pull request #19334 from rallytime/pylint 
Fix pylint on 2014.7 branch
 2015-01-03 21:59:12 -07:00
rallytime
57514d824b Fix pylint on 2014.7 branch 2015-01-03 21:44:09 -07:00
Nicole Thomas
621bcee92d Merge pull request #19273 from jayeshka/extfs_unit_tests 
adding extfs unit test
 2015-01-03 20:20:09 -07:00
Hang Xie
6edc596f28 Write to temp file then move to data.p to avoid race condition 2015-01-03 16:41:36 -08:00
James Michael DuPont
5d72c52838 load checking 
want to rebuild
fixes #19264

load checking

want to rebuild
 2015-01-03 16:22:36 -06:00
C. R. Oldham
434376cd69 Use salt.ext.six instead of "import six" 2015-01-03 09:09:38 -07:00
Joseph Hall
05089e188d Merge pull request #19325 from twellspring/patch-2 
Add private subnets
 2015-01-02 20:31:49 -07:00
twellspring
f8883cebdd Add private subnets 
Added how to enable rackspace private subnets on servers instantiated by salt cloud
 2015-01-02 19:28:45 -08:00
Thomas Jackson
e37353e50c Remove sock_dir from crypt.dropfile() 2015-01-02 16:14:19 -08:00
Thomas Jackson
deb60fd198 Make AES key never hit disk on the master 
In the past we've been doing coordination of the aes key using dropfiles etc. Not only is this significantly more costly (at least 1 stat per reqserver request) it also means that the symmetric key we use to pub/req messages has been on disk. This re-works the aes key to be a multiprocessing.Array() (char array) which is shared amongst the processes. Now the dropfile is just a request for the master to rotate the key, and this means that *all* key rotation on the master will generate the appropriate event (instead of just ones who passed in sock_dir to dropfile())
 2015-01-02 16:11:24 -08:00
Gareth J. Greenaway
6a3c15a7c3 Adding a simple notification function to the test module. 2015-01-02 15:24:32 -08:00
Thomas S Hatch
e2dd4b9958 Merge pull request #19320 from clan/opt_profile 
add 'state_output_profile' option for profile output
 2015-01-02 10:39:22 -07:00
Z. Liu
d46b6b6490 sate_output_profile default to True 2015-01-03 01:36:21 +08:00
Z. Liu
3fce994d30 fix type: statei -> state 2015-01-03 01:26:12 +08:00
Thomas S Hatch
b8dd2af989 Merge pull request #19319 from garethgreenaway/18630_2014_7_mount_options 
Fixes to mount module and mount state module
 2015-01-02 10:05:41 -07:00
Thomas S Hatch
908f382b49 Merge pull request #19312 from llinder/2014.7 
pydsl/pyobjects missing listen and listen_in
 2015-01-02 10:02:05 -07:00
Thomas S Hatch
e2ed214a8d Merge pull request #19310 from juiceinc/2014.7 
Fix typo in Tomcat module docs
 2015-01-02 10:01:54 -07:00
Thomas S Hatch
463974dc8b Merge pull request #19299 from terminalmage/cleanup-pip-requirements 
Cleanup pip state when requirements file is used
 2015-01-02 09:58:21 -07:00
Thomas S Hatch
ebbb66ddb2 Merge pull request #19285 from lyft/add-splunk-search 
Add initial splunk_search execution module and state module
 2015-01-02 09:56:57 -07:00
Thomas S Hatch
04e22ee809 Merge pull request #19321 from cvedel/issue-18083 
Add ssl_match_hostname to deps in thin tarball
 2015-01-02 09:40:17 -07:00
Gareth J. Greenaway
547d55b8e6 removing unused import 2015-01-02 08:06:28 -08:00
Christophe Vedel
9aeda9b754 Add ssl_match_hostname to deps in thin tarball 2015-01-02 16:44:41 +01:00
Z. Liu
8217f5fa66 add 'state_output_profile' option for profile output 2015-01-02 22:56:39 +08:00
Gareth J. Greenaway
2c7c5d3f81 merge conflict 2015-01-01 20:13:27 -08:00
Pedro Algarvio
c316c11168 Merge pull request #19314 from dawsonbotsford/develop 
Spelling correction automated from Dawson's Spelling Bee
 2014-12-31 23:39:07 +00:00
Shad Nygren
4b335b5e2c Fix TypeError: string indices must be integers, not str in ec2.py create_attach_volumes() 2014-12-31 23:14:04 +00:00
Shad Nygren
773d426adc Fix AttributeError: 'list' object has no attribute 'items' in cloud.py run_func_until_ret_arg() 2014-12-31 23:12:51 +00:00
dawsonbotsford
adcf77c484 Spelling correction automated from Dawson's Spelling Bee 2014-12-31 18:10:29 -05:00
Lance Linder
5c39c880fa pydsl/pyobjects missing listen and listen_in 
This pull request is to resolve issue 19311
 2014-12-31 11:03:50 -06:00
Tim O'Guin
b9744c6fff merge 2014-12-31 09:12:41 -06:00
Tim O'Guin
59bcfe6b74 fix config format typo in Tomcat module docs 2014-12-31 09:10:18 -06:00
Nassim KACHA
5705ed5389 Improved code readability 2014-12-31 14:24:59 +01:00
Nassim KACHA
d129b5dbf1 fix errors to pass lint test 2014-12-31 13:52:14 +01:00