Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Azure Fog Gems #4195

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft
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
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ gem 'actionview', '~> 7.2.1'
gem 'activemodel', '~> 7.2.2'
gem 'railties', '~> 7.2.1'

gem 'azure-storage-blob', git: 'https://github.com/sethboyles/azure-storage-ruby.git', branch: 'x-ms-blob-content-type-fix-1.1'
gem 'azure-storage-blob', git: 'https://github.com/sap-contributions/azure-storage-ruby.git', branch: 'merge-x-ms-branch-on-master'

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-azure-rm', git: 'https://github.com/sap-contributions/fog-azure-rm.git', branch: 'update-azure-storage'
gem 'fog-core', '~> 2.4.0'
gem 'fog-google', '~> 1.24.1'
gem 'fog-local'
Expand Down
136 changes: 78 additions & 58 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,37 +1,33 @@
GIT
remote: https://github.com/fog/fog-azure-rm.git
revision: 379e352cce817f8e67618062bf7095095d8f5c4c
branch: fog-arm-cf
remote: https://github.com/sap-contributions/azure-storage-ruby.git
revision: a93d91a2e75b138980bd7a90547ae43ea6299401
branch: merge-x-ms-branch-on-master
specs:
fog-azure-rm (0.4.7)
azure-storage-blob (~> 1.1)
azure-storage-common (~> 1.1)
azure_mgmt_compute (~> 0.9.0)
azure_mgmt_dns (~> 0.9.0)
azure_mgmt_key_vault (~> 0.9.0)
azure_mgmt_network (~> 0.9.0)
azure_mgmt_resources (~> 0.9.0)
azure_mgmt_sql (~> 0.9.0)
azure_mgmt_storage (~> 0.9.0)
azure_mgmt_traffic_manager (~> 0.9.0)
azure-storage-blob (2.0.3)
azure-storage-common (~> 2.0)
nokogiri (~> 1, >= 1.10.8)

GIT
remote: https://github.com/sap-contributions/fog-azure-rm.git
revision: d26d58071f4bbe1746b9b3f4ea02fcf7810f643b
branch: update-azure-storage
specs:
fog-azure-rm (0.6.1)
azure-storage-blob (~> 2.0)
azure-storage-common (~> 2.0)
azure_key_vault (>= 0.15.0)
azure_mgmt_compute (>= 0.15.0)
azure_mgmt_dns (>= 0.15.0)
azure_mgmt_network (>= 0.15.0)
azure_mgmt_resources (>= 0.15.0)
azure_mgmt_sql (>= 0.15.0)
azure_mgmt_storage (>= 0.15.0)
azure_mgmt_traffic_manager (>= 0.15.0)
fog-core (>= 1.43)
fog-json (>= 1.0.2)
mime-types (~> 3.0)
vhd (= 0.0.4)

GIT
remote: https://github.com/sethboyles/azure-storage-ruby.git
revision: d4737cdfcef3f3c4c2463a54690b6b73c0f6f707
branch: x-ms-blob-content-type-fix-1.1
specs:
azure-storage-blob (1.1.0)
azure-core (~> 0.1.13)
azure-storage-common (~> 1.0)
nokogiri (~> 1.6, >= 1.6.8)
azure-storage-common (1.1.0)
azure-core (~> 0.1.13)
nokogiri (~> 1.6, >= 1.6.8)

GIT
remote: https://github.com/sporkrb/spork
revision: 224df492657e617a0c93c0319e78f0eefee5b636
Expand Down Expand Up @@ -82,26 +78,27 @@ GEM
activesupport (>= 3.2)
i18n
ast (2.4.2)
azure-core (0.1.15)
faraday (~> 0.9)
faraday_middleware (~> 0.10)
nokogiri (~> 1.6)
azure_mgmt_compute (0.9.0)
ms_rest_azure (~> 0.7.0)
azure_mgmt_dns (0.9.0)
ms_rest_azure (~> 0.7.0)
azure_mgmt_key_vault (0.9.0)
ms_rest_azure (~> 0.7.0)
azure_mgmt_network (0.9.0)
ms_rest_azure (~> 0.7.0)
azure_mgmt_resources (0.9.0)
ms_rest_azure (~> 0.7.0)
azure_mgmt_sql (0.9.0)
ms_rest_azure (~> 0.7.0)
azure_mgmt_storage (0.9.0)
ms_rest_azure (~> 0.7.0)
azure_mgmt_traffic_manager (0.9.0)
ms_rest_azure (~> 0.7.0)
azure-storage-common (2.0.4)
faraday (~> 1.0)
faraday_middleware (~> 1.0, >= 1.0.0.rc1)
net-http-persistent (~> 4.0)
nokogiri (~> 1, >= 1.10.8)
azure_key_vault (0.19.1)
ms_rest_azure (~> 0.12.0)
azure_mgmt_compute (0.22.0)
ms_rest_azure (~> 0.12.0)
azure_mgmt_dns (0.17.5)
ms_rest_azure (~> 0.12.0)
azure_mgmt_network (0.26.1)
ms_rest_azure (~> 0.12.0)
azure_mgmt_resources (0.18.2)
ms_rest_azure (~> 0.12.0)
azure_mgmt_sql (0.19.1)
ms_rest_azure (~> 0.12.0)
azure_mgmt_storage (0.23.0)
ms_rest_azure (~> 0.12.0)
azure_mgmt_traffic_manager (0.17.4)
ms_rest_azure (~> 0.12.0)
backport (1.2.0)
base64 (0.2.0)
beefcake (1.0.0)
Expand Down Expand Up @@ -143,13 +140,34 @@ GEM
erubi (1.13.0)
eventmachine (1.2.7)
excon (0.112.0)
faraday (0.17.6)
multipart-post (>= 1.2, < 3)
faraday (1.10.4)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
faraday-httpclient (~> 1.0)
faraday-multipart (~> 1.0)
faraday-net_http (~> 1.0)
faraday-net_http_persistent (~> 1.0)
faraday-patron (~> 1.0)
faraday-rack (~> 1.0)
faraday-retry (~> 1.0)
ruby2_keywords (>= 0.0.4)
faraday-cookie_jar (0.0.7)
faraday (>= 0.8.0)
http-cookie (~> 1.0.0)
faraday_middleware (0.14.0)
faraday (>= 0.7.4, < 1.0)
faraday-em_http (1.0.0)
faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
faraday-httpclient (1.0.1)
faraday-multipart (1.1.0)
multipart-post (~> 2.0)
faraday-net_http (1.0.2)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faraday-rack (1.0.0)
faraday-retry (1.0.3)
faraday_middleware (1.2.1)
faraday (~> 1.0)
ffi (1.16.3)
ffi-compiler (1.3.2)
ffi (>= 1.15.5)
Expand Down Expand Up @@ -309,15 +327,15 @@ GEM
minitest (5.25.4)
mock_redis (0.49.0)
redis (~> 5)
ms_rest (0.6.4)
ms_rest (0.7.6)
concurrent-ruby (~> 1.0)
faraday (~> 0.9)
timeliness (~> 0.3)
ms_rest_azure (0.7.0)
faraday (>= 0.9, < 2.0.0)
timeliness (~> 0.3.10)
ms_rest_azure (0.12.0)
concurrent-ruby (~> 1.0)
faraday (~> 0.9)
faraday (>= 0.9, < 2.0.0)
faraday-cookie_jar (~> 0.0.6)
ms_rest (~> 0.6.3)
ms_rest (~> 0.7.6)
msgpack (1.7.2)
multi_json (1.15.0)
multipart-parser (0.1.1)
Expand All @@ -326,6 +344,8 @@ GEM
mustermann (3.0.0)
ruby2_keywords (~> 0.0.1)
mysql2 (0.5.6)
net-http-persistent (4.0.5)
connection_pool (~> 2.2)
net-ssh (7.3.0)
netaddr (2.0.6)
netrc (0.11.0)
Expand Down Expand Up @@ -553,7 +573,7 @@ GEM
thor (1.3.2)
tilt (2.3.0)
timecop (0.9.10)
timeliness (0.4.5)
timeliness (0.3.10)
trailblazer-option (0.1.2)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
Expand Down