Merge branch 'collectd-5.8'
authorPavel Rochnyack <pavel2000@ngs.ru>
Thu, 14 Dec 2017 16:38:05 +0000 (23:38 +0700)
committerPavel Rochnyack <pavel2000@ngs.ru>
Thu, 14 Dec 2017 16:38:05 +0000 (23:38 +0700)
1  2 
src/df.c
src/memcached.c

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