Merge remote-tracking branch 'upstream/master' into fix-freebsd-gitpython-package

This commit is contained in:
Matthew X. Economou
2015-07-24 16:53:24 -04:00
+1
View File
@@ -48,6 +48,7 @@ that differ from whats in defaults.yaml
'salt_syndic': 'py27-salt',
'salt_cloud': 'py27-salt',
'salt_api': 'py27-salt',
'salt_ssh': 'py27-salt',
'python_git': 'py27-GitPython',
'config_path': '/usr/local/etc/salt',
'minion_service': 'salt_minion',