summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2021-01-13 22:16:33 -0800
committerGitHub <noreply@github.com>2021-01-13 22:16:33 -0800
commit3089ae5ce92cf82e10516305803abc1840e1d2c9 (patch)
tree89e2a9c45ed771323bdb97735de161b7db647784
parent351273388a150423ea0bd51dba155584d31445d0 (diff)
parent6eec2d79778e8b5d75a6b317946bf94d4816b0b8 (diff)
downloadchef-3089ae5ce92cf82e10516305803abc1840e1d2c9.tar.gz
Merge pull request #10881 from MsysTechnologiesllc/Kapil/Github-10800_Update_uuidtools
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--Gemfile.lock4
-rw-r--r--chef.gemspec2
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index ccb7f9eadd..bc44fb5953 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -63,7 +63,7 @@ PATH
tty-prompt (~> 0.21)
tty-screen (~> 0.6)
tty-table (~> 0.11)
- uuidtools (~> 2.1.5)
+ uuidtools (>= 2.1.5, < 3.0)
chef (17.0.40-universal-mingw32)
addressable
bcrypt_pbkdf (= 1.1.0.rc2)
@@ -100,7 +100,7 @@ PATH
tty-prompt (~> 0.21)
tty-screen (~> 0.6)
tty-table (~> 0.11)
- uuidtools (~> 2.1.5)
+ uuidtools (>= 2.1.5, < 3.0)
win32-api (~> 1.5.3)
win32-certstore (~> 0.3)
win32-event (~> 0.6.1)
diff --git a/chef.gemspec b/chef.gemspec
index edf70dabfc..11dedca7ff 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -51,7 +51,7 @@ Gem::Specification.new do |s|
s.add_dependency "iniparse", "~> 1.4"
s.add_dependency "addressable"
s.add_dependency "syslog-logger", "~> 1.6"
- s.add_dependency "uuidtools", "~> 2.1.5"
+ s.add_dependency "uuidtools", ">= 2.1.5", "< 3.0"
s.add_dependency "proxifier", "~> 1.0"