Author: tomaz
Date: Tue Jun 11 18:58:43 2013
New Revision: 1491904
URL: http://svn.apache.org/r1491904
Log:
Backport commit from trunk.
Modified:
libcloud/branches/0.12.x/ (props changed)
libcloud/branches/0.12.x/CHANGES
libcloud/branches/0.12.x/libcloud/compute/drivers/gogrid.py
Propchange: libcloud/branches/0.12.x/
------------------------------------------------------------------------------
Merged /libcloud/trunk:r1491898
Modified: libcloud/branches/0.12.x/CHANGES
URL:
http://svn.apache.org/viewvc/libcloud/branches/0.12.x/CHANGES?rev=1491904&r1=1491903&r2=1491904&view=diff
==============================================================================
--- libcloud/branches/0.12.x/CHANGES (original)
+++ libcloud/branches/0.12.x/CHANGES Tue Jun 11 18:58:43 2013
@@ -81,6 +81,9 @@ Changes with Apache Libcloud in deveplom
- Fix old _wait_until_running method. (LIBCLOUD-339)
[Bob Thompson]
+ - Fix a bug in the GoGrid driver get_uuid method. (LIBCLOUD-341)
+ [Bob Thompson]
+
*) Storage
- Fix an issue with double encoding the container name in the CloudFiles
Modified: libcloud/branches/0.12.x/libcloud/compute/drivers/gogrid.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/0.12.x/libcloud/compute/drivers/gogrid.py?rev=1491904&r1=1491903&r2=1491904&view=diff
==============================================================================
--- libcloud/branches/0.12.x/libcloud/compute/drivers/gogrid.py (original)
+++ libcloud/branches/0.12.x/libcloud/compute/drivers/gogrid.py Tue Jun 11
18:58:43 2013
@@ -85,7 +85,7 @@ class GoGridNode(Node):
# so uuid of node should not change after add is completed
def get_uuid(self):
return hashlib.sha1(
- b("%s:%d" % (self.public_ips, self.driver.type))
+ b("%s:%s" % (self.public_ips, self.driver.type))
).hexdigest()
