Skip to content

Commit 2f5cbb4

Browse files
build(deps): bump fog-core from 2.1.2 to 2.4.0 (#3744)
* build(deps): bump fog-core from 2.1.2 to 2.4.0 Bumps [fog-core](https://github.com/fog/fog-core) from 2.1.2 to 2.4.0. - [Changelog](https://github.com/fog/fog-core/blob/master/changelog.md) - [Commits](fog/fog-core@v2.1.2...v2.4.0) --- updated-dependencies: - dependency-name: fog-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Remove fog aliyun hack Seems to be no longer needed with fog-core >= 2.3.0 References: - fog/fog-core#269 - fog/fog-aliyun#155 --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Johannes Haass <johannes.haass@sap.com>
1 parent b8eaeda commit 2f5cbb4

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ gem 'azure-storage-blob', git: 'https://github.com/sethboyles/azure-storage-ruby
5656
gem 'fog-aliyun'
5757
gem 'fog-aws'
5858
gem 'fog-azure-rm', git: 'https://github.com/fog/fog-azure-rm.git', branch: 'fog-arm-cf'
59-
gem 'fog-core', '~> 2.1.2'
59+
gem 'fog-core', '~> 2.4.0'
6060
gem 'fog-google', '~> 1.24.1'
6161
gem 'fog-local'
6262
gem 'fog-openstack'

Gemfile.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -181,10 +181,10 @@ GEM
181181
fog-core (~> 2.1)
182182
fog-json (~> 1.1)
183183
fog-xml (~> 0.1)
184-
fog-core (2.1.2)
184+
fog-core (2.4.0)
185185
builder
186-
excon (~> 0.58)
187-
formatador (~> 0.2)
186+
excon (~> 0.71)
187+
formatador (>= 0.2, < 2.0)
188188
mime-types
189189
fog-google (1.24.1)
190190
addressable (>= 2.7.0)
@@ -210,7 +210,7 @@ GEM
210210
fog-xml (0.1.4)
211211
fog-core
212212
nokogiri (>= 1.5.11, < 2.0.0)
213-
formatador (0.3.0)
213+
formatador (1.1.0)
214214
google-apis-compute_v1 (0.86.0)
215215
google-apis-core (>= 0.11.0, < 2.a)
216216
google-apis-core (0.11.3)
@@ -611,7 +611,7 @@ DEPENDENCIES
611611
fog-aliyun
612612
fog-aws
613613
fog-azure-rm!
614-
fog-core (~> 2.1.2)
614+
fog-core (~> 2.4.0)
615615
fog-google (~> 1.24.1)
616616
fog-local
617617
fog-openstack

lib/cloud_controller/blobstore/fog/providers.rb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
Fog::Logger[:deprecation] = nil
88

99
require 'fog/aliyun'
10-
# Hack until https://github.com/fog/fog-aliyun/pull/155 is merged and released
11-
Fog::Aliyun::Compute = Fog::Compute::Aliyun
12-
1310
require 'fog/aws'
1411
require 'fog/local'
1512
require 'fog/google'

0 commit comments

Comments
 (0)