You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by ma...@apache.org on 2012/07/04 13:08:50 UTC
git commit: Fix for DTACLOUD_249 - ruby 1.8/1.9 string incompatibility
Updated Branches:
refs/heads/master 63fe9f058 -> cc070f155
Fix for DTACLOUD_249 - ruby 1.8/1.9 string incompatibility
https://issues.apache.org/jira/browse/DTACLOUD-249
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/cc070f15
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/cc070f15
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/cc070f15
Branch: refs/heads/master
Commit: cc070f155f8ce74d35dd45fd55d15f41fd675860
Parents: 63fe9f0
Author: marios <ma...@redhat.com>
Authored: Wed Jul 4 14:03:36 2012 +0300
Committer: marios <ma...@redhat.com>
Committed: Wed Jul 4 14:03:36 2012 +0300
----------------------------------------------------------------------
server/lib/deltacloud/drivers/ec2/ec2_driver.rb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/cc070f15/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 7629ffa..2eddd9c 100644
--- a/server/lib/deltacloud/drivers/ec2/ec2_driver.rb
+++ b/server/lib/deltacloud/drivers/ec2/ec2_driver.rb
@@ -563,7 +563,7 @@ module Deltacloud
def storage_volumes(credentials, opts={})
ec2 = new_client( credentials )
- volume_list = (opts and opts[:id]) ? opts[:id] : nil
+ volume_list = (opts and opts[:id]) ? [opts[:id]] : []
safely do
ec2.describe_volumes(volume_list).collect do |volume|
convert_volume(volume)