From: Maryam Tahhan <maryam.tahhan@intel.com>
Date: Mon, 8 Aug 2016 07:59:35 +0000 (+0000)
Subject: Merge "fuel: update the commit used by the plugin"
X-Git-Tag: colorado.1.0~7
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=e1e872b6c4cc6a860ac997472bde41b66f2de26c;p=barometer.git

Merge "fuel: update the commit used by the plugin"
---

e1e872b6c4cc6a860ac997472bde41b66f2de26c
diff --cc src/fuel-plugin/pre_build_hook
index 6ce27784,31e6e004..3cca5bd8
--- a/src/fuel-plugin/pre_build_hook
+++ b/src/fuel-plugin/pre_build_hook
@@@ -17,12 -17,11 +17,12 @@@ function build_pkg 
        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 6c7cb6adf86fcaa6028ca42867ddcb0582111ab1
+       git checkout 73372f2eb86c81f12bc10b392f75050a401107db 
        tar cfvz ${DIR}/repositories/ubuntu/collectd-ceilometer.tgz . --exclude=collectd-ceilometer.tgz
  
 -      cd ${DIR}/build; ../build-collectd.sh
 -      cp *.deb ${DIR}/repositories/ubuntu
 +      # support collectd with dpdk later
 +      #cd ${DIR}/build; ../build-collectd.sh
 +      #cp *.deb ${DIR}/repositories/ubuntu
  
        rm -rf ${DIR}/build
        ;;