diff options
author | Tim Smith <tsmith@chef.io> | 2018-03-16 10:23:35 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-16 10:23:35 -0700 |
commit | 010cdf628db33df3dc0be865c97e6e06e08de1fa (patch) | |
tree | 5f4a565cf48e5092a38e99c6b579d0e96668965c | |
parent | 8608e0215ac0351e8d14300569b66933163c0a40 (diff) | |
parent | 4c859569d84acc1a3faeef742410d1a93b549f13 (diff) | |
download | chef-010cdf628db33df3dc0be865c97e6e06e08de1fa.tar.gz |
Merge pull request #6993 from chef/libarchive
Use Chef omnibus def that includes libarchive
-rw-r--r-- | Gemfile.lock | 8 | ||||
-rw-r--r-- | omnibus/Gemfile.lock | 16 |
2 files changed, 12 insertions, 12 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 7ee57b8cdd..30b0e96dd5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -140,7 +140,7 @@ GEM safe_yaml (~> 1.0.0) debug_inspector (0.0.3) diff-lcs (1.3) - docile (1.1.5) + docile (1.3.0) docker-api (1.34.1) excon (>= 0.47.0) multi_json @@ -237,7 +237,7 @@ GEM octokit (4.8.0) sawyer (~> 0.8.0, >= 0.5.3) parallel (1.12.1) - parser (2.5.0.3) + parser (2.5.0.4) ast (~> 2.4.0) parslet (1.8.2) plist (3.4.0) @@ -304,8 +304,8 @@ GEM rspec-its specinfra (~> 2.72) sfl (2.3) - simplecov (0.15.1) - docile (~> 1.1.0) + simplecov (0.16.1) + docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index ab1b8e2163..5a597be163 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -18,7 +18,7 @@ GIT GIT remote: https://github.com/chef/omnibus-software - revision: 33a94bf000d2f6eb0f738041be38f3e5e00a594e + revision: 31eddd2f8482f79869fc60bffd9c1ce11071844b branch: master specs: omnibus-software (4.0.0) @@ -31,13 +31,13 @@ GEM addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) awesome_print (1.8.0) - aws-sdk (2.11.11) - aws-sdk-resources (= 2.11.11) - aws-sdk-core (2.11.11) + aws-sdk (2.11.16) + aws-sdk-resources (= 2.11.16) + aws-sdk-core (2.11.16) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.11.11) - aws-sdk-core (= 2.11.11) + aws-sdk-resources (2.11.16) + aws-sdk-core (= 2.11.16) aws-sigv4 (1.0.2) berkshelf (4.3.5) addressable (~> 2.3, >= 2.3.4) @@ -110,7 +110,7 @@ GEM ipaddress (0.8.3) jmespath (1.3.1) json (2.1.0) - kitchen-vagrant (0.19.0) + kitchen-vagrant (1.3.1) test-kitchen (~> 1.4) libyajl2 (1.2.0) license_scout (1.0.1) @@ -146,7 +146,7 @@ GEM net-ssh (4.2.0) net-ssh-gateway (1.3.0) net-ssh (>= 2.6.5) - nio4r (2.2.0) + nio4r (2.3.0) nori (2.6.0) octokit (4.8.0) sawyer (~> 0.8.0, >= 0.5.3) |