fuel: rebase against stable/mitaka changes/11/17711/3
authorMaryam Tahhan <maryam.tahhan@intel.com>
Thu, 28 Jul 2016 12:20:47 +0000 (13:20 +0100)
committerMaryam Tahhan <maryam.tahhan@intel.com>
Wed, 3 Aug 2016 08:49:29 +0000 (09:49 +0100)
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>
src/fuel-plugin/pre_build_hook

index ffb4934..bfb2159 100755 (executable)
@@ -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