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

2015-07-24 16:53:24 -04:00 · 2015-07-24 16:53:24 -04:00 · ea5a9f1f2c
parent ef275bd138 bc0776e4e3
commit ea5a9f1f2c
1 changed files with 1 additions and 0 deletions
--- a/salt/map.jinja
+++ b/salt/map.jinja
@ -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',