Code

Merge branch 'pyr/riemann'
authorFlorian Forster <octo@collectd.org>
Mon, 21 Jan 2013 10:10:55 +0000 (11:10 +0100)
committerFlorian Forster <octo@collectd.org>
Mon, 21 Jan 2013 10:10:58 +0000 (11:10 +0100)
commit8a9ac11ae8f0f9999f75508b4413fe5c95bfe497
tree36baa9b28ac3e33cf22427335fbcd6c687305b7e
parentd37b132aaff8ff2bbf7c3181855857c486f35121
parentb4da854362a1e649b5767d79361dc08d6f41c4e1
Merge branch 'pyr/riemann'

Resolves Github issue #221.
configure.in
src/Makefile.am
src/collectd.conf.in
src/collectd.conf.pod