Merge remote-tracking branch 'upstream/master' into merge-master-branch
Conflicts:
collectd/client.sls
collectd/files/collectd.conf
collectd/files/collectd_python.conf
collectd/map.jinja
diff --git a/collectd/map.jinja b/collectd/map.jinja
index c25b5cb..0bfbe96 100644
--- a/collectd/map.jinja
+++ b/collectd/map.jinja
@@ -11,7 +11,7 @@
'use_fqdn': True,
},
'Debian': {
- 'pkgs': ['collectd-core', 'snmp', 'python-yaml', 'python-simplejson'],
+ 'pkgs': ['collectd-core', 'snmp', 'python-yaml', 'libpython2.7', 'python-simplejson'],
'service': 'collectd',
'config_file': '/etc/collectd/collectd.conf',
'config_dir': '/etc/collectd/conf.d',