From: Maryam Tahhan <maryam.tahhan@intel.com>
Date: Thu, 28 Jul 2016 12:20:47 +0000 (+0100)
Subject: fuel: rebase against stable/mitaka
X-Git-Tag: colorado.1.0~13
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fimports%2Fchanges%2F11%2F17711%2F3;p=barometer.git

fuel: rebase against stable/mitaka

Change the collectd-ceilometer repository from checking out a special
commit to using stable mitaka.

Change-Id: I40d88393a632769088fafabcd304242284ff0cf5
Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
---

diff --git a/src/fuel-plugin/pre_build_hook b/src/fuel-plugin/pre_build_hook
index ffb49347..bfb21596 100755
--- a/src/fuel-plugin/pre_build_hook
+++ b/src/fuel-plugin/pre_build_hook
@@ -14,12 +14,10 @@ function build_pkg {
   case $1 in
     ubuntu)
       rm -rf ${DIR}/repositories/ubuntu; mkdir -p ${DIR}/repositories/ubuntu
-     
       rm -rf ${DIR}/build; mkdir -p ${DIR}/build; cd ${DIR}/build;
-  
       git clone https://github.com/openstack/collectd-ceilometer-plugin
       cd  collectd-ceilometer-plugin
-      git checkout 3a4a1087566d1f9e8dd2d8d2e0608cb975942446
+      git checkout 6c7cb6adf86fcaa6028ca42867ddcb0582111ab1
       cat << EOF > collectd_ceilometer/__init__.py
 """Collectd Ceilometer plugin implementation"""
 EOF