Code

Merge branch 'collectd-5.5'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Tue, 26 Jul 2016 10:50:36 +0000 (12:50 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Tue, 26 Jul 2016 10:50:36 +0000 (12:50 +0200)
commitab11d1b4db61f750f51be6e41dbe8320d3c65404
tree8c136aa0f7e4258b0e7e229872a9ad815ddad1b4
parent23faf977688c7123d624b2911e69e2c9f4d0f78c
parentdc2eb041159b967838a2eb658cb256bc846c5264
Merge branch 'collectd-5.5'
src/daemon/meta_data.c
src/network.c