Code Review / fuel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 1772adc)
Rebase to collectd-ceilometer-plugin stable/mitaka 19/18019/5
authorGuo Ruijing <ruijing.guo@intel.com>
Mon, 8 Aug 2016 08:12:59 +0000 (16:12 +0800)
committerRuijing Guo <ruijing.guo@intel.com>
Tue, 9 Aug 2016 00:21:43 +0000 (00:21 +0000)
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>
build/f_isoroot/f_collectd-ceilometer-pluginbuild/config.mk patch | blob | history

diff --git a/build/f_isoroot/f_collectd-ceilometer-pluginbuild/config.mk b/build/f_isoroot/f_collectd-ceilometer-pluginbuild/config.mk
index 4781466..0106213 100644 (file)
--- 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?=