You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by mf...@apache.org on 2013/04/05 15:26:03 UTC
git commit: Core: Fixed dependency problem with latest excon
Updated Branches:
refs/heads/master 9c2550a32 -> d387f0c25
Core: Fixed dependency problem with latest excon
The latest excon is not compatible with VCR, however
the latest fog requires it.
This fix will monkey-patch excon to be backward-compatible
with old version.
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/d387f0c2
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/d387f0c2
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/d387f0c2
Branch: refs/heads/master
Commit: d387f0c25ae45ec55ea723aa1052c354efa658d0
Parents: 9c2550a
Author: Michal Fojtik <mf...@redhat.com>
Authored: Fri Apr 5 15:14:13 2013 +0200
Committer: Michal fojtik <mf...@redhat.com>
Committed: Fri Apr 5 15:14:13 2013 +0200
----------------------------------------------------------------------
server/deltacloud-core.gemspec | 1 -
.../lib/deltacloud/drivers/google/google_driver.rb | 6 ++++++
2 files changed, 6 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d387f0c2/server/deltacloud-core.gemspec
----------------------------------------------------------------------
diff --git a/server/deltacloud-core.gemspec b/server/deltacloud-core.gemspec
index f652dcf..d0d6094 100644
--- a/server/deltacloud-core.gemspec
+++ b/server/deltacloud-core.gemspec
@@ -105,7 +105,6 @@ Gem::Specification.new do |s|
# Terremark Vcloud Express
s.add_dependency('fog', '>= 1.4.0')
- s.add_dependency('excon', '>= 0.14.2', '<0.17.0' )
# Rhevm and Condor Cloud
s.add_dependency('rest-client')
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d387f0c2/server/lib/deltacloud/drivers/google/google_driver.rb
----------------------------------------------------------------------
diff --git a/server/lib/deltacloud/drivers/google/google_driver.rb b/server/lib/deltacloud/drivers/google/google_driver.rb
index e2f6c5d..81019fb 100644
--- a/server/lib/deltacloud/drivers/google/google_driver.rb
+++ b/server/lib/deltacloud/drivers/google/google_driver.rb
@@ -16,6 +16,12 @@
require 'fog'
require_relative '../../helpers/blob_stream_helper.rb'
+module Excon
+ class Connection
+ def connection;@data;end
+ end
+end
+
module Deltacloud
module Drivers
module Google