From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 21 Aug 2013 12:46:42 +0000 (+0000)
Subject: Merge "Create a Schema from a parameter"
X-Git-Tag: 2014.1~185
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=044a8aaf69d9874edfafb1c7658055141545d1cc;p=openstack-build%2Fheat-build.git

Merge "Create a Schema from a parameter"
---

044a8aaf69d9874edfafb1c7658055141545d1cc
diff --cc heat/tests/test_properties.py
index db64551e,003338e1..aa737fd0
--- a/heat/tests/test_properties.py
+++ b/heat/tests/test_properties.py
@@@ -15,8 -15,9 +15,9 @@@
  
  import testtools
  
+ from heat.engine import parameters
  from heat.engine import properties
 -from heat.engine import resource
 +from heat.engine import resources
  from heat.common import exception