Merge pull request #25375 from cachedout/config_fix_2014_7

Fix error in config.py for master_type
This commit is contained in:
Mike Place 2015-07-13 10:49:27 -06:00
commit 2a1dd1113f

View file

@ -271,7 +271,7 @@ VALID_OPTS = {
DEFAULT_MINION_OPTS = {
'interface': '0.0.0.0',
'master': 'salt',
'master_type': 'str',
'master_type': 'standard',
'master_port': '4506',
'master_finger': '',
'master_shuffle': False,