tree 1d733fe15f3a989a0a935611a102b75ec3ff5e33
parent c4dfdb616be77d2134884587dae929904be6f6f8
parent dae94a28e213f03f4b6cad59b20b6931165a4b62
author Simon Pasquier <spasquier@mirantis.com> 1477580810 +0200
committer Simon Pasquier <spasquier@mirantis.com> 1477580810 +0200

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