incubator-deltacloud-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Michal Fojtik <mfoj...@redhat.com>
Subject Re: [PATCH] Fix typo in EC2 driver 'convert_image' (image[:state] ==> image[:aws_state]) and remove trailing whitespace in image model.
Date Wed, 20 Jul 2011 12:16:20 GMT
On Jul 20, 2011, at 11:37 AM, marios@redhat.com wrote:

ACK. Nice catch Marios!

  -- Michal

> From: marios <marios@redhat.com>
> 
> 
> Signed-off-by: marios <marios@redhat.com>
> ---
> server/lib/deltacloud/drivers/ec2/ec2_driver.rb |    2 +-
> server/lib/deltacloud/models/image.rb           |    2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/server/lib/deltacloud/drivers/ec2/ec2_driver.rb b/server/lib/deltacloud/drivers/ec2/ec2_driver.rb
> index ab73d82..2bd9639 100644
> --- a/server/lib/deltacloud/drivers/ec2/ec2_driver.rb
> +++ b/server/lib/deltacloud/drivers/ec2/ec2_driver.rb
> @@ -734,7 +734,7 @@ module Deltacloud
>             :description => image[:aws_description] || image[:aws_location],
>             :owner_id => image[:aws_owner],
>             :architecture => image[:aws_architecture],
> -            :state => image[:state]
> +            :state => image[:aws_state]
>           )
>         end
> 
> diff --git a/server/lib/deltacloud/models/image.rb b/server/lib/deltacloud/models/image.rb
> index 91e1060..bdde7d0 100644
> --- a/server/lib/deltacloud/models/image.rb
> +++ b/server/lib/deltacloud/models/image.rb
> @@ -30,7 +30,7 @@ class Image < BaseModel
>     h.merge({
>       :actions => [ :create_instance => {
>         :method => 'post',
> -        :href => "#{Sinatra::UrlForHelper::DEFAULT_URI_PREFIX}/instances;image_id=#{self.id}"

> +        :href => "#{Sinatra::UrlForHelper::DEFAULT_URI_PREFIX}/instances;image_id=#{self.id}"

Maybe I'm blind, but what is the difference between this two lines?


>       }]
>     })
>   end
> -- 
> 1.7.3.4
> 

------------------------------------------------------
Michal Fojtik, mfojtik@redhat.com
Deltacloud API: http://deltacloud.org


Mime
View raw message