summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2019-01-18 15:38:11 -0800
committerTim Smith <tsmith@chef.io>2019-01-18 15:38:11 -0800
commite6e609ef19646b901b4ac83015958c25570363c6 (patch)
tree994bdd0530d1fbdbe9c9b17758208e78782992fb
parent5945db66f6f12344ab6fa706014dbe69c1742945 (diff)
downloadchef-e6e609ef19646b901b4ac83015958c25570363c6.tar.gz
Allow for mixlib-archive 1.xnewer_mixlib_archive
1.x will work just fine here. Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--Gemfile.lock8
-rw-r--r--chef.gemspec2
2 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index a67485af5f..e0b2cd56ce 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -38,7 +38,7 @@ PATH
ffi-yajl (~> 2.2)
highline (~> 1.6, >= 1.6.9)
iniparse (~> 1.4)
- mixlib-archive (~> 0.4)
+ mixlib-archive (>= 0.4, < 2.0)
mixlib-authentication (~> 2.1)
mixlib-cli (~> 1.7)
mixlib-log (~> 2.0, >= 2.0.3)
@@ -69,7 +69,7 @@ PATH
highline (~> 1.6, >= 1.6.9)
iniparse (~> 1.4)
iso8601 (~> 0.12.1)
- mixlib-archive (~> 0.4)
+ mixlib-archive (>= 0.4, < 2.0)
mixlib-authentication (~> 2.1)
mixlib-cli (~> 1.7)
mixlib-log (~> 2.0, >= 2.0.3)
@@ -198,9 +198,9 @@ GEM
addressable (~> 2.3)
libyajl2 (1.2.0)
method_source (0.9.2)
- mixlib-archive (0.4.19)
+ mixlib-archive (1.0.1)
mixlib-log
- mixlib-archive (0.4.19-universal-mingw32)
+ mixlib-archive (1.0.1-universal-mingw32)
mixlib-log
mixlib-authentication (2.1.1)
mixlib-cli (1.7.0)
diff --git a/chef.gemspec b/chef.gemspec
index 15fc862deb..3e41b8e5ba 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
s.add_dependency "mixlib-log", "~> 2.0", ">= 2.0.3"
s.add_dependency "mixlib-authentication", "~> 2.1"
s.add_dependency "mixlib-shellout", "~> 2.4"
- s.add_dependency "mixlib-archive", "~> 0.4"
+ s.add_dependency "mixlib-archive", ">= 0.4", "< 2.0"
s.add_dependency "ohai", "~> 15.0"
s.add_dependency "ffi", "~> 1.9", ">= 1.9.25"