From cea70a737be5948f5252319ce41bbd5175026034 Mon Sep 17 00:00:00 2001
From: Taras Chornyi <tarasx.chornyi@intel.com>
Date: Wed, 7 Sep 2016 15:16:15 +0100
Subject: src: Fixed dpdkstats and ceilometer-plugin build issues.

Change-Id: Ie8abb8e6be3c5c2100b672c83f488177c8b66638
Signed-off-by: Taras Chornyi <tarasx.chornyi@intel.com>
---
 src/collectd/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/collectd')

diff --git a/src/collectd/Makefile b/src/collectd/Makefile
index 2233149b..58cebb58 100644
--- a/src/collectd/Makefile
+++ b/src/collectd/Makefile
@@ -94,7 +94,7 @@ $(WORK_DIR):
 	$(AT)git clone $(COLLECTD_URL)
 
 $(TAG_DONE_FLAG): $(WORK_DIR)
-	$(AT)cd collectd-with-DPDK; git checkout $(COLLECTD_TAG)
+	$(AT)cd collectd-with-DPDK; git checkout $(COLLECTD_TAG); git rebase master
 ifneq ($(PATCH_FILE),)
 	$(AT)cd $(WORK_DIR); patch -p1 < ../$(PATCH_FILE)
 endif
-- 
cgit 1.2.3-korg