From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 30 Apr 2013 09:51:37 +0000 (+0000)
Subject: Merge "Validate properties against the schema in validate_template"
X-Git-Tag: 2014.1~685
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=a6f228783ce9a6b8195b37b0e028ec88cbc37f1f;p=openstack-build%2Fheat-build.git

Merge "Validate properties against the schema in validate_template"
---

a6f228783ce9a6b8195b37b0e028ec88cbc37f1f
diff --cc heat/engine/service.py
index 55b793cf,484fee10..583c7437
--- a/heat/engine/service.py
+++ b/heat/engine/service.py
@@@ -28,7 -28,9 +28,8 @@@ from heat.common import exceptio
  from heat.common import identifier
  from heat.engine import parameters
  from heat.engine import parser
+ from heat.engine import properties
  from heat.engine import resource
 -from heat.engine import resources  # pyflakes_bypass review 23102
  from heat.engine import watchrule
  
  from heat.openstack.common import log as logging