Merge pull request #11136 from cvrebert/patch-2

fix typo: salt.config.{minion_conf=>minion_config}
This commit is contained in:
Thomas S Hatch 2014-03-11 12:12:59 -07:00
commit a1c0b60b15

View File

@ -67,7 +67,7 @@ def _minion_opts(cfg='minion'):
default_dir = salt.syspaths.CONFIG_DIR,
cfg = os.environ.get(
'SALT_MINION_CONFIG', os.path.join(default_dir, cfg))
opts = config.minion_conf(cfg)
opts = config.minion_config(cfg)
return opts