Code

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)
1  2 
src/collectd.conf.pod
src/memcached.c

Simple merge
diff --cc src/memcached.c
Simple merge