deltacloud-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mar...@apache.org
Subject [5/9] git commit: Fixed formatting
Date Fri, 28 Jun 2013 09:06:34 GMT
Fixed formatting


Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/b75f0a44
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/b75f0a44
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/b75f0a44

Branch: refs/heads/master
Commit: b75f0a44b6e9c364ef5dcf1945735446caf53bcf
Parents: 9e53cb0
Author: David Ellinger <dellinger@ltionline.com>
Authored: Fri May 24 14:38:54 2013 -0400
Committer: marios <marios@redhat.com>
Committed: Fri Jun 28 12:05:50 2013 +0300

----------------------------------------------------------------------
 server/lib/deltacloud/drivers/ec2/ec2_driver.rb | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltacloud/blob/b75f0a44/server/lib/deltacloud/drivers/ec2/ec2_driver.rb
----------------------------------------------------------------------
diff --git a/server/lib/deltacloud/drivers/ec2/ec2_driver.rb b/server/lib/deltacloud/drivers/ec2/ec2_driver.rb
index 7c41aeb..71539b3 100644
--- a/server/lib/deltacloud/drivers/ec2/ec2_driver.rb
+++ b/server/lib/deltacloud/drivers/ec2/ec2_driver.rb
@@ -123,23 +123,18 @@ module Deltacloud
         end
 
         define_instance_states do
+
           start.to( :pending )          .automatically
           pending.to( :running )        .automatically
           running.to( :running )        .on( :reboot )
           running.to( :stopping )       .on( :stop )
           stopping.to(:stopped)         .automatically
           stopped.to( :running )        .on( :start )
-          stopped.to(:finish)         .on( :destroy)
+          stopped.to(:finish)           .on( :destroy)
 
           #pending.to( :stopping )       .on( :stop )
           #pending.to( :stopped )        .automatically
 
-          
-         
-          
-
-          
-
         end
 
         # We do not allow users to set the endpoint through environment
@@ -337,6 +332,7 @@ module Deltacloud
 
         def stop_instance(credentials, instance_id)
           ec2 = new_client(credentials)
+          #TODO: If image root is ebs (or persistent) then stop instance otherwise need to
run "destroy_instance"
           if ec2.stop_instances([instance_id])
             instance(credentials, :id => instance_id)
           else


Mime
View raw message