valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
37,488 Commits 24 Branches 182 Tags 341 MiB
1062e66f71
Commit Graph

37488 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
4da0b59d7d Merge pull request #19378 from llinder/2014.7 
Fixed undefined data variable in s3 utils
 2015-01-06 10:01:05 -07:00
Thomas S Hatch
99de56f131 Merge pull request #19386 from eliasp/2014.7-modules.parted.mkpart-doc 
Correct doc
 2015-01-06 09:57:19 -07:00
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
Lance Linder
cf9bc435c5 Fixed undefined data variable in s3 utils 2015-01-05 23:46:02 -06: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
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
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
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
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
nmadhok
44454a3687 Replacing zfs with zpool 2015-01-05 14:05:55 -07:00
nmadhok
8670e399ce Adding unit tests for salt.modules.zpool 2015-01-05 14:05:55 -07:00
Niklas Laxström
9efb07eece Fix execution order with "names" 
Fixes #13312. Used fractional parts of floats to ensure correct sort
order. The issue with previous solution to use order + name_order was
that all states come with preassigned order, and thus order + name_order
will match the order of the following states. This solution limits the
maximum value of name_order to 9999 before the same issue arises again.

I don't quite understand why the order_chunks function is duplicated
twice. I updated both instances.
 2015-01-05 14:02:17 -07:00
Mike Place
2e1bfa38b9 Avoid a race between multiple auth requests for a minion key. 
Refs #19061
 2015-01-05 14:00:17 -07:00
Joseph Hall
92744e9541 mapper.opts, not self.opts 2015-01-05 13:46:06 -07:00
Joseph Hall
473dea47f0 Use proper query method from CloudClient 2015-01-05 13:42:39 -07:00
Mike Place
0194fbe77c Attempt to fix inconsintent VT test by preventing a spin 2015-01-05 13:35:02 -07:00
Thomas S Hatch
c43256d5fc Merge pull request #19350 from UtahDave/2014.7local 
Fix thread leak on Windows when using threading.
 2015-01-05 13:28:30 -07:00
David Boucha
d83858bb40 fix pylint whitespace errors 2015-01-05 11:48:01 -07:00
David Boucha
88fbb8bc90 fix pylint error: extra space after def 2015-01-05 11:44:10 -07:00
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
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
Hang Xie
6edc596f28 Write to temp file then move to data.p to avoid race condition 2015-01-03 16:41:36 -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
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
Gareth J. Greenaway
2c7c5d3f81 merge conflict 2015-01-01 20:13:27 -08: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