Code

Merge branch 'collectd-5.7' into collectd-5.8
authorMarc Fournier <marc.fournier@camptocamp.com>
Mon, 6 Nov 2017 21:25:33 +0000 (22:25 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Mon, 6 Nov 2017 21:25:33 +0000 (22:25 +0100)
commit936d749328d399463f2bbb5ec3d07cd3a271a7c7
tree7af9d5a78e584a3269ee0180b8ba98364c77ba37
parenta4f7a5d80431df5aad83aa718d4e0583379d8681
parentcb6b71db9d0416b50849cc39d8d5f7dd75823cd3
Merge branch 'collectd-5.7' into collectd-5.8

Conflicts:
src/netlink.c
src/netlink.c