Merge "Support any distribution without UserData/MetaData"

author Jenkins <jenkins@review.openstack.org>

Wed, 31 Jul 2013 09:43:31 +0000 (09:43 +0000)

committer Gerrit Code Review <review@openstack.org>

Wed, 31 Jul 2013 09:43:31 +0000 (09:43 +0000)
author Jenkins <jenkins@review.openstack.org>
Wed, 31 Jul 2013 09:43:31 +0000 (09:43 +0000)
committer Gerrit Code Review <review@openstack.org>
Wed, 31 Jul 2013 09:43:31 +0000 (09:43 +0000)
diff --cc heat/engine/resources/rackspace/cloud_server.py
Simple merge
diff --cc heat/tests/test_rackspace_cloud_server.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Wed, 31 Jul 2013 09:43:31 +0000 (09:43 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Wed, 31 Jul 2013 09:43:31 +0000 (09:43 +0000)
		1	2
heat/engine/resources/rackspace/cloud_server.py	patch \|	diff1 \|	diff2 \|	blob \| history
heat/tests/test_rackspace_cloud_server.py	patch \|	diff1 \|	diff2 \|	blob \| history