Merge remote-tracking branch 'origin/master'

2014-09-11 15:09:10 -05:00
parent 5943adbf35 f710fc5708
commit ad5cf8c7ce
1 changed files with 2 additions and 2 deletions
--- a/ec2driver.py
+++ b/ec2driver.py
@@ -290,10 +290,10 @@ class EC2Driver(driver.ComputeDriver):
        pass

    def pause(self, instance):
-        pass
+        self.power_off(instance)

    def unpause(self, instance):
-        pass
+        self.power_on(context=None, instance=instance, network_info=None, block_device_info=None)

    def suspend(self, instance):
        self.power_off(instance)