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

Merge remote branch 'upstream/develop' into develop

Browse Source
This commit is contained in:
Forrest Alvarez 2014-01-12 05:23:14 +00:00
commit 60b05663de
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/runners/cache.py
View File

@ -75,6 +75,7 @@ def pillar(tgt=None, expr_form='glob', **kwargs):
salt.output.display_output(cached_pillar, None, __opts__)
return cached_pillar
def mine(tgt=None, expr_form='glob', **kwargs):
'''
Return cached mine data of the targeted minions
@ -103,6 +104,7 @@ def mine(tgt=None, expr_form='glob', **kwargs):
cached_mine = pillar_util.get_cached_mine_data()
salt.output.display_output(cached_mine, None, __opts__)
def _clear_cache(tgt=None,
expr_form='glob',
clear_pillar=False,

2
salt/states/archive.py
View File

@ -127,7 +127,7 @@ def extracted(name,
cwd=name)
if results['retcode'] != 0:
return results
if __salt__['cmd.retcode']('tar --version | grep bsdtar') == 0:
if __salt__['cmd.retcode']('tar --version | grep bsdtar') == 0:
files = results['stderr']
else:
files = results['stdout']

6
salt/utils/master.py
View File

@ -98,9 +98,9 @@ class MasterPillarUtil(object):
mine_data = dict([(minion_id, {}) for minion_id in minion_ids])
if (not self.opts.get('minion_data_cache', False)
and not self.opts.get('enforce_mine_cache', False)):
log.debug('Skipping cached mine data minion_data_cache'
'and enfore_mine_cache are both disabled.')
return mine_data
log.debug('Skipping cached mine data minion_data_cache'
'and enfore_mine_cache are both disabled.')
return mine_data
mdir = os.path.join(self.opts['cachedir'], 'minions')
try:
for minion_id in minion_ids: