Merge branch 'feature-log-logstash' of github.com:pyr/collectd into feature-log-logstash
authorPierre-Yves Ritschard <pyr@spootnik.org>
Fri, 17 Jan 2014 12:17:12 +0000 (13:17 +0100)
committerPierre-Yves Ritschard <pyr@spootnik.org>
Fri, 17 Jan 2014 12:17:12 +0000 (13:17 +0100)
commit72ec1d0ed6cde4aa78f17d031e7a48e37cbf7a57
tree1cdae5582a250ed608078a9f287dbf88dc650296
parentca8b50eff1e9341159416c8b53f2d1d11b99591b
parentab4488bbc2f371fd7bfb1c3659471160dfdbc2cb
Merge branch 'feature-log-logstash' of github.com:pyr/collectd into feature-log-logstash

Conflicts:
configure.ac
configure.ac
src/Makefile.am
src/collectd.conf.in