From: Angus Salkeld <asalkeld@redhat.com>
Date: Tue, 24 Jul 2012 06:48:55 +0000 (+1000)
Subject: delete duplicate validate() method
X-Git-Tag: 2014.1~1564
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=f95e459e80625150e91413f54a76090163fc7bb0;p=openstack-build%2Fheat-build.git

delete duplicate validate() method

probably a merge conflict.

Change-Id: Ibe8941ab471943b7385ceb4b4d4559719a7092b6
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
---

diff --git a/heat/engine/resources.py b/heat/engine/resources.py
index 77453e23..8be4182a 100644
--- a/heat/engine/resources.py
+++ b/heat/engine/resources.py
@@ -288,9 +288,6 @@ class Resource(object):
                 self.state_set(self.UPDATE_COMPLETE)
             return result
 
-    def validate(self):
-        logger.info('Validating %s' % str(self))
-
     def validate(self):
         logger.info('Validating %s' % str(self))