summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn McCrae <john.mccrae@progress.com>2022-12-22 12:35:51 -0800
committerGitHub <noreply@github.com>2022-12-22 12:35:51 -0800
commit52411e2d66ce4a339caab3e408d234d97b1606fa (patch)
treeba60b4bb830b7850760705c243fb709963cba2c3
parenta8511b9db33ac0299821a88dc6d749ec34aa3081 (diff)
parent5a2f9b6b68f71a609d296df2619ba8008354de25 (diff)
downloadchef-52411e2d66ce4a339caab3e408d234d97b1606fa.tar.gz
Merge pull request #13457 from chef/jfm/chef16_ssl_errors_part2
recorrecting the ssl errors in chef-16
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock36
2 files changed, 19 insertions, 19 deletions
diff --git a/Gemfile b/Gemfile
index de389a1f2b..187a2e54de 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ source "https://rubygems.org"
gem "ffi", ">=1.15"
# Nwed to file a bug with rest-client. In the meantime, we can use this until they accept the update.
-gem "rest-client", ">=2.1.0"
+gem "rest-client", git: "https://github.com/chef/rest-client", branch: "jfm/ucrt_update1"
# Note we do not use the gemspec DSL which restricts to the
# gemspec for the current platform and filters out other platforms
diff --git a/Gemfile.lock b/Gemfile.lock
index 0c5c44b156..b65691c2b1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,6 +17,23 @@ GIT
train-core
wmi-lite (~> 1.0)
+GIT
+ remote: https://github.com/chef/rest-client
+ revision: badd0bea3c31a2ed1f49590760d2e4b665ecbce3
+ branch: jfm/ucrt_update1
+ specs:
+ rest-client (2.1.0)
+ http-accept (>= 1.7.0, < 2.0)
+ http-cookie (>= 1.0.2, < 2.0)
+ mime-types (>= 1.16, < 4.0)
+ netrc (~> 0.8)
+ rest-client (2.1.0-x64-mingw32)
+ ffi (~> 1.15)
+ http-accept (>= 1.7.0, < 2.0)
+ http-cookie (>= 1.0.2, < 2.0)
+ mime-types (>= 1.16, < 4.0)
+ netrc (~> 0.8)
+
PATH
remote: .
specs:
@@ -299,23 +316,6 @@ GEM
rake (13.0.6)
rb-readline (0.5.5)
regexp_parser (2.6.1)
- rest-client (2.1.0)
- http-accept (>= 1.7.0, < 2.0)
- http-cookie (>= 1.0.2, < 2.0)
- mime-types (>= 1.16, < 4.0)
- netrc (~> 0.8)
- rest-client (2.1.0-x64-mingw32)
- ffi (~> 1.9)
- http-accept (>= 1.7.0, < 2.0)
- http-cookie (>= 1.0.2, < 2.0)
- mime-types (>= 1.16, < 4.0)
- netrc (~> 0.8)
- rest-client (2.1.0-x86-mingw32)
- ffi (~> 1.9)
- http-accept (>= 1.7.0, < 2.0)
- http-cookie (>= 1.0.2, < 2.0)
- mime-types (>= 1.16, < 4.0)
- netrc (~> 0.8)
rexml (3.2.5)
rspec (3.12.0)
rspec-core (~> 3.12.0)
@@ -471,7 +471,7 @@ DEPENDENCIES
pry-stack_explorer
rake
rb-readline
- rest-client (>= 2.1.0)
+ rest-client!
rspec
ruby-prof (< 1.3.0)
ruby-shadow