Merge branch 'collectd-5.6' into collectd-5.7
authorPavel Rochnyack <pavel2000@ngs.ru>
Fri, 20 Oct 2017 13:54:09 +0000 (20:54 +0700)
committerPavel Rochnyack <pavel2000@ngs.ru>
Fri, 20 Oct 2017 13:54:09 +0000 (20:54 +0700)
commit55ffaf9ad7c8b180ac0192adb1a6ff6adc72c5a3
tree9ce2e9bf4bee3c8e58fe4116446bc9907f5fa458
parente21b137ec98244a6dc8da6898504ec3763a2ce13
parentcb966fce03a0129ecaf028d0ff61bc543b343c5f
Merge branch 'collectd-5.6' into collectd-5.7
src/collectd.conf.pod
src/memcached.c