Merge "Gate on H703"

author Jenkins <jenkins@review.openstack.org>

Fri, 14 Jun 2013 08:53:26 +0000 (08:53 +0000)

committer Gerrit Code Review <review@openstack.org>

Fri, 14 Jun 2013 08:53:26 +0000 (08:53 +0000)
author Jenkins <jenkins@review.openstack.org>
Fri, 14 Jun 2013 08:53:26 +0000 (08:53 +0000)
committer Gerrit Code Review <review@openstack.org>
Fri, 14 Jun 2013 08:53:26 +0000 (08:53 +0000)
diff --cc heat/api/cfn/v1/stacks.py
Simple merge
diff --cc tox.ini
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Fri, 14 Jun 2013 08:53:26 +0000 (08:53 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Fri, 14 Jun 2013 08:53:26 +0000 (08:53 +0000)
		1	2
heat/api/cfn/v1/stacks.py	patch \|	diff1 \|	diff2 \|	blob \| history
tox.ini	patch \|	diff1 \|	diff2 \|	blob \| history