Merge pull request #2157 from maryamtahhan/dpdkevents_upstream

author Ruben Kerkhof <ruben@rubenkerkhof.com>

Fri, 24 Feb 2017 16:19:21 +0000 (17:19 +0100)

committer GitHub <noreply@github.com>

Fri, 24 Feb 2017 16:19:21 +0000 (17:19 +0100)
author Ruben Kerkhof <ruben@rubenkerkhof.com>
Fri, 24 Feb 2017 16:19:21 +0000 (17:19 +0100)
committer GitHub <noreply@github.com>
Fri, 24 Feb 2017 16:19:21 +0000 (17:19 +0100)
diff --cc configure.ac
Simple merge
diff --cc src/collectd.conf.in
Simple merge
diff --cc src/collectd.conf.pod
Simple merge
author	Ruben Kerkhof <ruben@rubenkerkhof.com>
	Fri, 24 Feb 2017 16:19:21 +0000 (17:19 +0100)
committer	GitHub <noreply@github.com>
	Fri, 24 Feb 2017 16:19:21 +0000 (17:19 +0100)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history