diff options
| author | Thom May <thom@chef.io> | 2017-03-18 12:59:27 +0000 |
|---|---|---|
| committer | Thom May <thom@chef.io> | 2017-03-18 12:59:27 +0000 |
| commit | 243c22754b4655770fd3e2d8cd08d483e725201f (patch) | |
| tree | 226bfc7d36571c96453e51933c84d87f07ebab04 | |
| parent | b2ab74b7470d1cdd9813a8b29375e2acd583b5d8 (diff) | |
| download | chef-tm/test_12_pipelines.tar.gz | |
update omnibus/omnibus-softwaretm/test_12_pipelines
Signed-off-by: Thom May <thom@chef.io>
| -rw-r--r-- | omnibus/Gemfile | 4 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 18 |
2 files changed, 10 insertions, 12 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile index 735b371c62..2ccffa2ed8 100644 --- a/omnibus/Gemfile +++ b/omnibus/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" -gem "omnibus", github: "chef/omnibus", branch: "rhass/COOL-502_with_gcc_investigate" -gem "omnibus-software", github: "chef/omnibus-software", branch: "shain/ruby_windows_monster" +gem "omnibus", github: "chef/omnibus" +gem "omnibus-software", github: "chef/omnibus-software" gem "license_scout", github: "chef/license_scout" gem "pedump" diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index ceb322bf20..da4bdba9db 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -8,8 +8,7 @@ GIT GIT remote: git://github.com/chef/omnibus-software.git - revision: 086710002ec0054b3d240d14ca04d11163f528aa - branch: shain/ruby_windows_monster + revision: 80e2f11de0518addb1c3cf40c9ad6f274c5205a0 specs: omnibus-software (4.0.0) chef-sugar (>= 3.4.0) @@ -17,8 +16,7 @@ GIT GIT remote: git://github.com/chef/omnibus.git - revision: dce5283a85a44484a66a8a84991beba92e46fd12 - branch: rhass/COOL-502_with_gcc_investigate + revision: 76d907f4fe92a28c5f7ab11779341e1d773c358d specs: omnibus (5.5.0) aws-sdk (~> 2) @@ -39,13 +37,13 @@ GEM public_suffix (~> 2.0, >= 2.0.2) artifactory (2.6.0) awesome_print (1.7.0) - aws-sdk (2.7.5) - aws-sdk-resources (= 2.7.5) - aws-sdk-core (2.7.5) + aws-sdk (2.8.7) + aws-sdk-resources (= 2.8.7) + aws-sdk-core (2.8.7) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.7.5) - aws-sdk-core (= 2.7.5) + aws-sdk-resources (2.8.7) + aws-sdk-core (= 2.8.7) aws-sigv4 (1.0.0) berkshelf (4.3.5) addressable (~> 2.3, >= 2.3.4) @@ -267,4 +265,4 @@ DEPENDENCIES winrm-fs (~> 1.0) BUNDLED WITH - 1.12.5 + 1.14.6 |