diff options
| author | Tim Smith <tsmith@chef.io> | 2019-01-21 10:02:27 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-21 10:02:27 -0800 |
| commit | 0fd98e0d267e9d5eef6ddea1026043470d235399 (patch) | |
| tree | dae208aad7353d9b41f149a4217cb5ad5f6407aa | |
| parent | 676cc0cfd7705a61269c6845d054b84fa8ba50f8 (diff) | |
| parent | daaf0d0941b611c6e4428517fbbf13bdc852ab5a (diff) | |
| download | chef-0fd98e0d267e9d5eef6ddea1026043470d235399.tar.gz | |
Merge pull request #8141 from chef/mixlib_14
Allow for mixlib-archive 1.x
| -rw-r--r-- | Gemfile.lock | 8 | ||||
| -rw-r--r-- | chef.gemspec | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 863e4c59d4..a420fed2e7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -20,7 +20,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) @@ -51,7 +51,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) @@ -179,9 +179,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 13ec88f223..0268c1da81 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", "~> 14.0" s.add_dependency "ffi", "~> 1.9", ">= 1.9.25" |