Merge remote-tracking branch 'origin/pr/598'
authorMarc Fournier <marc.fournier@camptocamp.com>
Tue, 3 Mar 2015 20:36:21 +0000 (21:36 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Tue, 3 Mar 2015 20:36:21 +0000 (21:36 +0100)
commit0febfbd11d87acd8a0f10bbcf5d4a58bb68b8dc0
treeaabf53308cca29ba4c8cc34c10daf04df9bcc393
parent22d5f76d3379a5f61873c52363116ee4ba67afa4
parent82f7cee169bd303db5a1e80ca8125bcdcba48d4d
Merge remote-tracking branch 'origin/pr/598'

Conflicts:
src/collectd.conf.in
src/types.db
configure.ac
src/Makefile.am
src/ceph.c
src/collectd.conf.in
src/collectd.conf.pod
src/types.db