Author: tomaz
Date: Thu Jun 6 22:07:02 2013
New Revision: 1490459
URL: http://svn.apache.org/r1490459
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/base.py
Propchange: libcloud/branches/0.12.x/
------------------------------------------------------------------------------
Merged /libcloud/trunk:r1490458
Modified: libcloud/branches/0.12.x/CHANGES
URL:
http://svn.apache.org/viewvc/libcloud/branches/0.12.x/CHANGES?rev=1490459&r1=1490458&r2=1490459&view=diff
==============================================================================
--- libcloud/branches/0.12.x/CHANGES (original)
+++ libcloud/branches/0.12.x/CHANGES Thu Jun 6 22:07:02 2013
@@ -78,6 +78,9 @@ Changes with Apache Libcloud in deveplom
CloudStack driver. (LIBCLOUD-338)
[sebastien goasguen]
+ - Fix old _wait_until_running method. (LIBCLOUD-339)
+ [Bob Thompson]
+
*) Storage
- Fix an issue with double encoding the container name in the CloudFiles
Modified: libcloud/branches/0.12.x/libcloud/compute/base.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/0.12.x/libcloud/compute/base.py?rev=1490459&r1=1490458&r2=1490459&view=diff
==============================================================================
--- libcloud/branches/0.12.x/libcloud/compute/base.py (original)
+++ libcloud/branches/0.12.x/libcloud/compute/base.py Thu Jun 6 22:07:02 2013
@@ -773,10 +773,10 @@ class NodeDriver(BaseDriver):
ssh_interface='public_ips', force_ipv4=True):
# This is here for backward compatibility and will be removed in the
# next major release
- return self._wait_until_running(nodes=[node], wait_period=wait_period,
- timeout=timeout,
- ssh_interface=ssh_interface,
- force_ipv4=force_ipv4)
+ return self.wait_until_running(nodes=[node], wait_period=wait_period,
+ timeout=timeout,
+ ssh_interface=ssh_interface,
+ force_ipv4=force_ipv4)
def wait_until_running(self, nodes, wait_period=3, timeout=600,
ssh_interface='public_ips', force_ipv4=True):
