Merge pull request #23344 from cachedout/issue_22742

Explicitely set file_client on master
This commit is contained in:
Nicole Thomas 2015-05-04 17:21:48 -06:00
commit 02658b1e60

View file

@ -438,6 +438,7 @@ DEFAULT_MASTER_OPTS = {
'pillar_roots': {
'base': [salt.syspaths.BASE_PILLAR_ROOTS_DIR],
},
'file_client': 'local',
'gitfs_remotes': [],
'gitfs_mountpoint': '',
'gitfs_root': '',