diff options
| author | Thom May <thom@chef.io> | 2018-06-06 18:12:28 +0100 |
|---|---|---|
| committer | Thom May <thom@chef.io> | 2018-06-13 11:57:31 +0100 |
| commit | 5c1790841596fe86576f89d44362c04ae5e6d87d (patch) | |
| tree | 41a7f73520279969ac1d9e9d6fe1e05b76ce96d6 | |
| parent | 87629766f156fae2105a1882587e6d09f341181e (diff) | |
| download | chef-5c1790841596fe86576f89d44362c04ae5e6d87d.tar.gz | |
test libarchive branchtm/archive_winning
Signed-off-by: Thom May <thom@chef.io>
| -rw-r--r-- | omnibus/Gemfile | 2 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile index 5457f0f40b..d3350b1848 100644 --- a/omnibus/Gemfile +++ b/omnibus/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" gem "omnibus", git: "https://github.com/chef/omnibus", branch: "master" -gem "omnibus-software", git: "https://github.com/chef/omnibus-software", branch: "master" +gem "omnibus-software", git: "https://github.com/chef/omnibus-software", branch: "tm/cmake_archive" gem "pedump" diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 1bcf7ab0ae..30c6ffb7b9 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -18,8 +18,8 @@ GIT GIT remote: https://github.com/chef/omnibus-software - revision: 88ce7ac44a6be8a36b6582fa6f50150ed38a87c7 - branch: master + revision: 9ecf65ba1073fcfebdcad006438eb8e7d960124a + branch: tm/cmake_archive specs: omnibus-software (4.0.0) chef-sugar (>= 3.4.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.66) - aws-sdk-resources (= 2.11.66) - aws-sdk-core (2.11.66) + aws-sdk (2.11.67) + aws-sdk-resources (= 2.11.67) + aws-sdk-core (2.11.67) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.11.66) - aws-sdk-core (= 2.11.66) + aws-sdk-resources (2.11.67) + aws-sdk-core (= 2.11.67) aws-sigv4 (1.0.2) berkshelf (4.3.5) addressable (~> 2.3, >= 2.3.4) @@ -226,7 +226,7 @@ GEM hitimes toml-rb (1.1.1) citrus (~> 3.0, > 3.0) - tomlrb (1.2.6) + tomlrb (1.2.7) varia_model (0.4.1) buff-extensions (~> 1.0) hashie (>= 2.0.2, < 4.0.0) |