Merge "cleanup and also fetch the charms first then deploy."

author Narinder Gupta <narinder.gupta@canonical.com>

Fri, 6 May 2016 13:04:42 +0000 (13:04 +0000)

committer Gerrit Code Review <gerrit@172.30.200.206>

Fri, 6 May 2016 13:04:42 +0000 (13:04 +0000)
author Narinder Gupta <narinder.gupta@canonical.com>
Fri, 6 May 2016 13:04:42 +0000 (13:04 +0000)
committer Gerrit Code Review <gerrit@172.30.200.206>
Fri, 6 May 2016 13:04:42 +0000 (13:04 +0000)
diff --cc ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
Simple merge
diff --cc ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
Simple merge
diff --cc ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
Simple merge
author	Narinder Gupta <narinder.gupta@canonical.com>
	Fri, 6 May 2016 13:04:42 +0000 (13:04 +0000)
committer	Gerrit Code Review <gerrit@172.30.200.206>
	Fri, 6 May 2016 13:04:42 +0000 (13:04 +0000)
		1	2
ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml	patch \|	diff1 \|	diff2 \|	blob \| history