Merge "do the cleanup before deploy maas." into stable/brahmaputra

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

Fri, 22 Jan 2016 19:56:05 +0000 (19:56 +0000)

committer Gerrit Code Review <gerrit@172.30.200.206>

Fri, 22 Jan 2016 19:56:05 +0000 (19:56 +0000)
author Narinder Gupta <narinder.gupta@canonical.com>
Fri, 22 Jan 2016 19:56:05 +0000 (19:56 +0000)
committer Gerrit Code Review <gerrit@172.30.200.206>
Fri, 22 Jan 2016 19:56:05 +0000 (19:56 +0000)
diff --cc ci/02-maasdeploy.sh
Simple merge
diff --cc ci/cleanvm.sh

index 5277bf4,d334517..5277bf4

mode 100644,100755..100755
--- 1/ci/cleanvm.sh
--- 2/ci/cleanvm.sh
+++ b/ci/cleanvm.sh
author	Narinder Gupta <narinder.gupta@canonical.com>
	Fri, 22 Jan 2016 19:56:05 +0000 (19:56 +0000)
committer	Gerrit Code Review <gerrit@172.30.200.206>
	Fri, 22 Jan 2016 19:56:05 +0000 (19:56 +0000)
		1	2
ci/02-maasdeploy.sh	patch \|	diff1 \|	diff2 \|	blob \| history
ci/cleanvm.sh	patch \|	diff1 \|	diff2 \|	blob \| history