Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ gem 'azure-storage-blob', git: 'https://github.com/sethboyles/azure-storage-ruby
gem 'fog-aliyun'
gem 'fog-aws'
gem 'fog-azure-rm', git: 'https://github.com/fog/fog-azure-rm.git', branch: 'fog-arm-cf'
gem 'fog-core', '~> 2.1.2'
gem 'fog-core', '~> 2.4.0'
gem 'fog-google', '~> 1.24.1'
gem 'fog-local'
gem 'fog-openstack'
Expand Down
10 changes: 5 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,10 @@ GEM
fog-core (~> 2.1)
fog-json (~> 1.1)
fog-xml (~> 0.1)
fog-core (2.1.2)
fog-core (2.4.0)
builder
excon (~> 0.58)
formatador (~> 0.2)
excon (~> 0.71)
formatador (>= 0.2, < 2.0)
mime-types
fog-google (1.24.1)
addressable (>= 2.7.0)
Expand All @@ -209,7 +209,7 @@ GEM
fog-xml (0.1.4)
fog-core
nokogiri (>= 1.5.11, < 2.0.0)
formatador (0.3.0)
formatador (1.1.0)
google-apis-compute_v1 (0.86.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-core (0.11.3)
Expand Down Expand Up @@ -608,7 +608,7 @@ DEPENDENCIES
fog-aliyun
fog-aws
fog-azure-rm!
fog-core (~> 2.1.2)
fog-core (~> 2.4.0)
fog-google (~> 1.24.1)
fog-local
fog-openstack
Expand Down
3 changes: 0 additions & 3 deletions lib/cloud_controller/blobstore/fog/providers.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
Fog::Logger[:deprecation] = nil

require 'fog/aliyun'
# Hack until https://github.com/fog/fog-aliyun/pull/155 is merged and released
Fog::Aliyun::Compute = Fog::Compute::Aliyun

require 'fog/aws'
require 'fog/local'
require 'fog/google'
Expand Down