summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuo Ruijing <ruijing.guo@intel.com>2016-08-10 00:58:28 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-10 00:58:28 +0000
commitd19c4589554b2d82b6fcb1fe921ffeffd9377a2f (patch)
treeaba8d4f5cd5e90d0caa6a83129f95d95b092eb71
parentf8fe6cb863118896bfc157f56ca7185d866db6c0 (diff)
parent5a072a6c6b097a9c3c54ea3f0656dfa5d8839182 (diff)
Merge "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"
-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?=