aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmma Foley <emma.l.foley@intel.com>2017-09-15 11:06:01 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-15 11:06:01 +0000
commitcb18d3ccb4d3b27fa814a3b73ff0d840ee992baf (patch)
treed13ec58e7d4f69dd24e4adeecaf22ca2a826c77d
parent9b7a9535b7afa826d65dcb16444304906585d2c4 (diff)
parent0c699c739aa3a804bcdb761ac46d5c9915097c1e (diff)
Merge "src: rename dir - collectd-ceilometer-plugin/ -> collectd-openstack-plugin/"
-rw-r--r--src/Makefile2
-rw-r--r--src/collectd-openstack-plugins/Makefile (renamed from src/collectd-ceilometer-plugin/Makefile)4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Makefile b/src/Makefile
index 382acefc..e7a472c1 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -38,6 +38,6 @@ SUBDIRS += dpdk
SUBDIRS += libpqos
SUBDIRS += pmu-tools
SUBDIRS += collectd
-SUBDIRS += collectd-ceilometer-plugin
+SUBDIRS += collectd-openstack-plugins
include mk/make-subsys.mk
diff --git a/src/collectd-ceilometer-plugin/Makefile b/src/collectd-openstack-plugins/Makefile
index a8b8f938..96bbebb8 100644
--- a/src/collectd-ceilometer-plugin/Makefile
+++ b/src/collectd-openstack-plugins/Makefile
@@ -25,7 +25,7 @@ include ../package-list.mk
.PHONY: force_make install
-WORK_DIR = collectd-ceilometer-plugin
+WORK_DIR = collectd-openstack-plugins
TAG_DONE_FLAG = $(WORK_DIR)/.$(COLLECTD_OPENSTACK_TAG).tag.done
all: force_make install
@@ -59,5 +59,5 @@ sanity:
@echo "Make sanity in $(WORK_DIR) (stub) "
$(WORK_DIR):
- $(AT)git clone $(COLLECTD_OPENSTACK_URL)
+ $(AT)git clone $(COLLECTD_OPENSTACK_URL) $(WORK_DIR)