summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuo Ruijing <ruijing.guo@intel.com>2016-08-08 16:12:59 +0800
committerRuijing Guo <ruijing.guo@intel.com>2016-08-09 00:21:43 +0000
commit5a072a6c6b097a9c3c54ea3f0656dfa5d8839182 (patch)
treef95e3845d8086aa73721970236bc1bedcae315a1
parent1772adc5124b3ebdb7593d6f7758e2879edb8c97 (diff)
Rebase to collectd-ceilometer-plugin stable/mitaka
1. fix pbr:version_string in collectd-ceilometer-plugin 2. disable collectd build to use stock collectd 3. update README in fuel plugin Change-Id: I773910c03d109af1fc1f86a5709105e9ffbfc350 Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
-rw-r--r--build/f_isoroot/f_collectd-ceilometer-pluginbuild/config.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/f_isoroot/f_collectd-ceilometer-pluginbuild/config.mk b/build/f_isoroot/f_collectd-ceilometer-pluginbuild/config.mk
index 4781466dd..0106213d3 100644
--- a/build/f_isoroot/f_collectd-ceilometer-pluginbuild/config.mk
+++ b/build/f_isoroot/f_collectd-ceilometer-pluginbuild/config.mk
@@ -8,6 +8,6 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-COLLECTD_CEILOMETER_BRANCH?=efa17094249282eb0726b3d30dff190b86a97938
+COLLECTD_CEILOMETER_BRANCH?=3ddf95235ef62de5fb9a520b3aa8f120518b0077
COLLECTD_CEILOMETER_REPO?=http://gerrit.opnfv.org/gerrit/fastpathmetrics
COLLECTD_CEILOMETER_CHANGE?=