Merge "modified to download both trusty and xenial images."

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

Fri, 13 May 2016 18:43:41 +0000 (18:43 +0000)

committer Gerrit Code Review <gerrit@172.30.200.206>

Fri, 13 May 2016 18:43:41 +0000 (18:43 +0000)
author Narinder Gupta <narinder.gupta@canonical.com>
Fri, 13 May 2016 18:43:41 +0000 (18:43 +0000)
committer Gerrit Code Review <gerrit@172.30.200.206>
Fri, 13 May 2016 18:43:41 +0000 (18:43 +0000)
diff --cc ci/02-maasdeploy.sh
Simple merge
diff --cc ci/maas/intel/pod9/deployment.yaml
Simple merge
author	Narinder Gupta <narinder.gupta@canonical.com>
	Fri, 13 May 2016 18:43:41 +0000 (18:43 +0000)
committer	Gerrit Code Review <gerrit@172.30.200.206>
	Fri, 13 May 2016 18:43:41 +0000 (18:43 +0000)
		1	2
ci/02-maasdeploy.sh	patch \|	diff1 \|	diff2 \|	blob \| history
ci/maas/intel/pod9/deployment.yaml	patch \|	diff1 \|	diff2 \|	blob \| history