1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00

Merge pull request #1048 from sugarb/master

Fix for issue #1047
This commit is contained in:
Wesley Beary 2012-07-20 12:17:56 -07:00
commit 8e3ee75555

View file

@ -58,7 +58,7 @@ module Fog
end
when "rebooting" # I don't know how to show rebooting just once before it changes to available
# it applies pending modified values
if server["PendingModifiedValues"]
unless server["PendingModifiedValues"].empty?
server.merge!(server["PendingModifiedValues"])
server["PendingModifiedValues"] = {}
self.data[:tmp] ||= Time.now + Fog::Mock.delay * 2
@ -69,13 +69,13 @@ module Fog
end
when "modifying"
# TODO there are some fields that only applied after rebooting
if server["PendingModifiedValues"]
unless server["PendingModifiedValues"].empty?
server.merge!(server["PendingModifiedValues"])
server["PendingModifiedValues"] = {}
server["DBInstanceStatus"] = 'available'
end
when "available" # I'm not sure if amazon does this
if server["PendingModifiedValues"]
unless server["PendingModifiedValues"].empty?
server["DBInstanceStatus"] = 'modifying'
end