Merge branch 'master' into fix_deprecated_func
authorkevin-laatz-intel <kevin.laatz@intel.com>
Mon, 2 Jul 2018 14:51:04 +0000 (15:51 +0100)
committerGitHub <noreply@github.com>
Mon, 2 Jul 2018 14:51:04 +0000 (15:51 +0100)
commit74ee9a04ef5785b31d1acbfdcbcece3370668cfe
treeea76da80a693b42218ae1d7e509e834c0b002878
parent1228db65c5b58345e55c48191a2af2eee69f0f34
parent67d1044ac1307b1bb385d13d0f0bccaadd5a63fe
Merge branch 'master' into fix_deprecated_func
src/dpdkevents.c
src/utils_dpdk.c