Skip to content

Commit

Permalink
Merge pull request #37521 from genuss/fix_refresh_pillar
Browse files Browse the repository at this point in the history
refresh_pillar() should be called always with refresh=True during saltutil.sync_all
  • Loading branch information
Mike Place committed Nov 7, 2016
2 parents ffa4631 + 3f4c339 commit c2984a9
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions salt/modules/saltutil.py
Original file line number Diff line number Diff line change
Expand Up @@ -636,8 +636,7 @@ def sync_all(saltenv=None, refresh=True):
ret['pillar'] = sync_pillar(saltenv, False)
if refresh:
refresh_modules()
if __opts__['file_client'] == 'local':
refresh_pillar()
refresh_pillar()
return ret


Expand Down

0 comments on commit c2984a9

Please sign in to comment.