From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Thu, 21 Sep 2017 09:20:34 +0000 (+0000)
Subject: Revert "pull in heat bug fix."
X-Git-Tag: opnfv-6.0.0~54^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=406b485a394ad2f1231a7c37ae781d7e005cb5d9;p=joid.git

Revert "pull in heat bug fix."

This reverts commit 533dfeac9078ec05bc1c755078b4da74e8c5266d.

Change-Id: Icf04741d6ee463155d1d58274884deca8a625975
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
---

diff --git a/ci/nosdn/fetch-charms.sh b/ci/nosdn/fetch-charms.sh
index 93dd7e3e..48feb590 100755
--- a/ci/nosdn/fetch-charms.sh
+++ b/ci/nosdn/fetch-charms.sh
@@ -31,9 +31,6 @@ git clone -b stable/17.08 https://github.com/openstack/charm-nova-compute.git $d
 git clone -b stable/17.08 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
 git clone -b stable/17.08 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
 git clone -b stable/17.08 https://github.com/openstack/charm-heat.git $distro/heat
-cd $distro/heat
-git pull https://git.openstack.org/openstack/charm-heat refs/changes/19/504219/1
-cd ../../
 git clone -b stable/17.08 https://github.com/openstack/charm-lxd.git $distro/lxd
 git clone https://github.com/openbaton/juju-charm.git $distro/openbaton
 
diff --git a/ci/odl/fetch-charms.sh b/ci/odl/fetch-charms.sh
index 565d48ee..9b7adaed 100755
--- a/ci/odl/fetch-charms.sh
+++ b/ci/odl/fetch-charms.sh
@@ -31,9 +31,6 @@ git clone -b stable/17.08 https://github.com/openstack/charm-nova-compute.git $d
 git clone -b stable/17.08 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
 git clone -b stable/17.08 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
 git clone -b stable/17.08 https://github.com/openstack/charm-heat.git $distro/heat
-cd $distro/heat
-git pull https://git.openstack.org/openstack/charm-heat refs/changes/19/504219/1
-cd ../../
 git clone -b stable/17.08 https://github.com/openstack/charm-lxd.git $distro/lxd
 git clone -b stable/17.08 https://github.com/openstack/charm-odl-controller.git $distro/odl-controller
 git clone -b stable/17.08 https://github.com/openstack/charm-neutron-api-odl.git $distro/neutron-api-odl
diff --git a/ci/onos/fetch-charms.sh b/ci/onos/fetch-charms.sh
index cfe4f14b..3ffc628f 100755
--- a/ci/onos/fetch-charms.sh
+++ b/ci/onos/fetch-charms.sh
@@ -32,9 +32,6 @@ git clone -b stable/17.08 https://github.com/openstack/charm-nova-compute.git $d
 git clone -b stable/17.08 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
 git clone -b stable/17.08 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
 git clone -b stable/17.08 https://github.com/openstack/charm-heat.git $distro/heat
-cd $distro/heat
-git pull https://git.openstack.org/openstack/charm-heat refs/changes/19/504219/1
-cd ../../
 git clone https://github.com/openstack/charm-lxd.git $distro/lxd
 git clone https://github.com/openbaton/juju-charm.git $distro/openbaton
 
diff --git a/ci/opencontrail/fetch-charms.sh b/ci/opencontrail/fetch-charms.sh
index 7eb9bdfd..2a88ba63 100755
--- a/ci/opencontrail/fetch-charms.sh
+++ b/ci/opencontrail/fetch-charms.sh
@@ -31,9 +31,6 @@ git clone -b stable/17.08 https://github.com/openstack/charm-nova-compute.git $d
 git clone -b stable/17.08 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
 git clone -b stable/17.08 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
 git clone -b stable/17.08 https://github.com/openstack/charm-heat.git $distro/heat
-cd $distro/heat
-git pull https://git.openstack.org/openstack/charm-heat refs/changes/19/504219/1
-cd ../../
 git clone -b stable/17.08 https://github.com/openstack/charm-lxd.git $distro/lxd
 git clone https://github.com/openbaton/juju-charm.git $distro/openbaton