Merge pull request #37553 from rallytime/bp-37521

Back-port #37521 to 2016.3
This commit is contained in:
Mike Place 2016-11-09 12:11:07 +13:00 committed by GitHub
commit b01c247ea9

View file

@ -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