Merge "Revert "pull in heat bug fix.""

4 files changed, 0 insertions, 12 deletions

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