valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
37,457 Commits 24 Branches 182 Tags 341 MiB
e923ff11e8
Commit Graph

37457 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
e923ff11e8 Merge pull request #19404 from eliasp/2014.7-states.service-dont-report-changes 
Don't report changes when there aren't any
 2015-01-06 14:05:36 -07:00
Nicole Thomas
83e451d392 Merge pull request #19401 from rallytime/test_fixes 
Pylint and psutil unit test fixes for 2014.7 branch
 2015-01-06 13:24:15 -07:00
Elias Probst
4b1413fc8a Don't report changes when there aren't any 2015-01-06 21:22:08 +01:00
rallytime
c105867720 namedtuple doesn't exist in psutil._compat in psutil 2.2.0 2015-01-06 12:08:31 -07:00
Nicole Thomas
ec84d57aee Merge pull request #19397 from rallytime/bp-19396 
Backport #19396 to 2014.7
 2015-01-06 11:23:53 -07:00
Mike Place
88f3477772 These were unused and causing weird recursion errors in unit tests 2015-01-06 11:22:32 -07:00
rallytime
73ef44dd9f Pylint fix for 2014.7 branch 2015-01-06 11:14:06 -07:00
Thomas S Hatch
5452436bb2 Merge pull request #19394 from s0undt3ch/2014.7 
Remove unused script
 2015-01-06 11:06:55 -07:00
Pedro Algarvio
f377a74fa2 Remove unused script 2015-01-06 17:54:23 +00:00
Thomas S Hatch
6d3461d688 Merge pull request #19391 from lorengordon/2014.7 
Update vcredist version, fixes saltstack/salt#19387
 2015-01-06 10:28:11 -07:00
Thomas S Hatch
4566591f55 Merge pull request #19369 from eliasp/2014.7-states.mount_invisible-options 
2014.7 states.mount invisible options
 2015-01-06 10:22:43 -07:00
Thomas S Hatch
f5349e96a6 Merge pull request #19358 from rallytime/bp-19347 
Backport #19347 to 2014.7
 2015-01-06 10:18:18 -07:00
Loren Gordon
7f7c7bd337 Update vcredist version, fixes saltstack/salt#19387 
Install the most current version of vcredist, Microsoft Visual C++ 2008
Service Pack 1 Redistributable Package MFC Security Update.
 2015-01-06 12:18:13 -05:00
Thomas S Hatch
aec0417e13 Merge pull request #19357 from rallytime/bp-19278 
Backport #19278 to 2014.7
 2015-01-06 10:18:08 -07:00
Thomas S Hatch
41bef7771e Merge pull request #19356 from rallytime/bp-19340 
Backport #19340 to 2014.7
 2015-01-06 10:17:49 -07:00
Thomas S Hatch
2775737859 Merge pull request #19355 from rallytime/bp-19247 
Backport #19247 to 2014.7
 2015-01-06 10:17:27 -07:00
Thomas S Hatch
c6b367095e Merge pull request #19354 from cachedout/avoid_open_mode_key_race 
Avoid a race between multiple auth requests for a minion key
 2015-01-06 10:17:09 -07:00
Thomas S Hatch
ce34da5bdc Merge pull request #19353 from rallytime/bp-18323 
Backport #18323 to 2014.7
 2015-01-06 10:16:37 -07:00
Thomas S Hatch
e31cd4208a Merge pull request #19352 from rallytime/bp-19280 
Backport #19280 to 2014.7
 2015-01-06 10:16:25 -07:00
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