From: Jonas Bjurel <jonas.bjurel@ericsson.com>
Date: Fri, 8 Apr 2016 09:59:41 +0000 (+0000)
Subject: Merge "Remove duplicate import of hashlib"
X-Git-Tag: colorado.1.rc1~168
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=2bf79e8ab955b189c3d806b678b8f11c4966331d;p=fuel.git

Merge "Remove duplicate import of hashlib"
---

2bf79e8ab955b189c3d806b678b8f11c4966331d
diff --cc deploy/deploy-config.py
index d02a93717,7e79b9df5..65d51b228
--- a/deploy/deploy-config.py
+++ b/deploy/deploy-config.py
@@@ -86,11 -86,10 +86,10 @@@ def warning(msg)
                                                 'NC': NC})
  
  def setup_yaml():
 -  represent_dict_order = lambda self, data:  self.represent_mapping('tag:yaml.org,2002:map', data.items())
 -  yaml.add_representer(collections.OrderedDict, represent_dict_order)
 +    represent_dict_order = lambda self, data:  self.represent_mapping('tag:yaml.org,2002:map', data.items())
 +    yaml.add_representer(collections.OrderedDict, represent_dict_order)
  
  def sha_uri(uri):
-     import hashlib
      response = urllib2.urlopen(uri)
      data = response.read()
      sha1 = hashlib.sha1()