Merge branch 'collectd-5.7'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Tue, 6 Jun 2017 08:31:07 +0000 (10:31 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Tue, 6 Jun 2017 08:31:07 +0000 (10:31 +0200)
commit1035fba8812893e50d00a871e3399cc1ece3b384
treef9714eab0df93e7c361e1b5b6aa1a0dd37769416
parent47c86ace348a1d7a5352a83d10935209f89aa4f5
parent25ecb56638f243b36b1f274c67a5c40d7d23ee6a
Merge branch 'collectd-5.7'

Conflicts:
src/intel_rdt.c
src/intel_rdt.c