aboutsummaryrefslogtreecommitdiffstats
path: root/src/collectd
diff options
context:
space:
mode:
Diffstat (limited to 'src/collectd')
-rw-r--r--src/collectd/Makefile2
1 files changed, 1 insertions, 1 deletions
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