summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-03-19 15:21:08 -0700
committerTim Smith <tsmith@chef.io>2018-03-22 13:43:59 -0700
commit475f09571c0bef9b484f15b96edec524e7312999 (patch)
tree705dd3579b3176b40215240ce231f1d5eb7d661b
parentcd8885b42461f7c95f467d0f7c03dcafe9235d02 (diff)
downloadchef-use_libarchive.tar.gz
Use the latest libarchive/bzip2 defs in omnibususe_libarchive
This gets us bz2 support in libarchive Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--Gemfile.lock17
-rw-r--r--omnibus/Gemfile.lock17
2 files changed, 18 insertions, 16 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index b4d8239bba..711fb59320 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
GIT
remote: https://github.com/chef/chefstyle.git
- revision: 8d9aed96d01f93a1b14583f902b7504cf61b9f72
+ revision: e3805466d90b7efc6ede3d186244ded6a4b2116c
branch: master
specs:
- chefstyle (0.8.0)
- rubocop (= 0.52.1)
+ chefstyle (0.9.0)
+ rubocop (= 0.54.0)
PATH
remote: .
@@ -103,7 +103,7 @@ GEM
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
builder (3.2.3)
- byebug (10.0.0)
+ byebug (10.0.1)
chef-vault (3.3.0)
chef-zero (14.0.1)
ffi-yajl (~> 2.2)
@@ -190,7 +190,8 @@ GEM
mixlib-log
mixlib-authentication (1.4.2)
mixlib-cli (1.7.0)
- mixlib-config (2.2.5)
+ mixlib-config (2.2.6)
+ tomlrb
mixlib-log (2.0.3)
mixlib-shellout (2.3.2)
mixlib-shellout (2.3.2-universal-mingw32)
@@ -251,7 +252,7 @@ GEM
websocket (~> 1.0)
rack (2.0.4)
rainbow (3.0.0)
- rake (12.3.0)
+ rake (12.3.1)
rb-readline (0.5.5)
rspec (3.7.0)
rspec-core (~> 3.7.0)
@@ -272,9 +273,9 @@ GEM
rspec_junit_formatter (0.2.3)
builder (< 4)
rspec-core (>= 2, < 4, != 2.12.0)
- rubocop (0.52.1)
+ rubocop (0.54.0)
parallel (~> 1.10)
- parser (>= 2.4.0.2, < 3.0)
+ parser (>= 2.5)
powerpack (~> 0.1)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 5a597be163..b68e7ee13e 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -18,7 +18,7 @@ GIT
GIT
remote: https://github.com/chef/omnibus-software
- revision: 31eddd2f8482f79869fc60bffd9c1ce11071844b
+ revision: e97dc51025c6c8d70409f41ba1dec6d4cce6a176
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.16)
- aws-sdk-resources (= 2.11.16)
- aws-sdk-core (2.11.16)
+ aws-sdk (2.11.19)
+ aws-sdk-resources (= 2.11.19)
+ aws-sdk-core (2.11.19)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
- aws-sdk-resources (2.11.16)
- aws-sdk-core (= 2.11.16)
+ aws-sdk-resources (2.11.19)
+ aws-sdk-core (= 2.11.19)
aws-sigv4 (1.0.2)
berkshelf (4.3.5)
addressable (~> 2.3, >= 2.3.4)
@@ -72,7 +72,7 @@ GEM
buff-shell_out (0.2.0)
buff-ruby_engine (~> 0.1.0)
builder (3.2.3)
- byebug (10.0.0)
+ byebug (10.0.1)
celluloid (0.16.0)
timers (~> 4.0.0)
celluloid-io (0.16.2)
@@ -127,7 +127,8 @@ GEM
mixlib-log
mixlib-authentication (1.4.2)
mixlib-cli (1.7.0)
- mixlib-config (2.2.5)
+ mixlib-config (2.2.6)
+ tomlrb
mixlib-install (3.9.3)
mixlib-shellout
mixlib-versioning