diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2016-11-07 09:09:31 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-07 09:09:31 -0800 |
| commit | 08c416ee17a9449c479720edc3d6f04940eb3372 (patch) | |
| tree | c3242eaac12a15b4cab0942ed3e373a7f3439220 | |
| parent | 573d2d59705065409620b8c1960be7d3881d8aa9 (diff) | |
| parent | 6aaeaef0050b483e6dd74eca4030a8ab9cc7f21d (diff) | |
| download | chef-08c416ee17a9449c479720edc3d6f04940eb3372.tar.gz | |
Merge pull request #5516 from chef/jsinha/cherrypick-omnibus
Cherry Pick omnibus commits
| -rw-r--r-- | omnibus/Gemfile.lock | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index cbd6d96ec6..e64c4659b4 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: git://github.com/chef/license_scout.git - revision: c6c4a7bbcdbc73733217764db3bd5d278f63533e + revision: 95a308e01848e7843c84fa9be6214fa06e30f436 specs: license_scout (0.1.2) ffi-yajl (~> 2.2) @@ -17,7 +17,7 @@ GIT GIT remote: git://github.com/chef/omnibus.git - revision: 5b28abc2bf4b74a4bed515a38784a4aae7a72e90 + revision: 0612bf6333b2a7b125e599228ec6c46cbaa3ed3d branch: rhass/COOL-502_with_gcc_investigate specs: omnibus (5.5.0) @@ -38,12 +38,12 @@ GEM addressable (2.4.0) artifactory (2.5.0) awesome_print (1.7.0) - aws-sdk (2.6.14) - aws-sdk-resources (= 2.6.14) - aws-sdk-core (2.6.14) + aws-sdk (2.6.18) + aws-sdk-resources (= 2.6.18) + aws-sdk-core (2.6.18) jmespath (~> 1.0) - aws-sdk-resources (2.6.14) - aws-sdk-core (= 2.6.14) + aws-sdk-resources (2.6.18) + aws-sdk-core (= 2.6.18) berkshelf (4.3.5) addressable (~> 2.3, >= 2.3.4) berkshelf-api-client (~> 2.0, >= 2.0.2) @@ -127,7 +127,7 @@ GEM mixlib-log mixlib-cli (1.7.0) mixlib-config (2.2.4) - mixlib-install (2.1.5) + mixlib-install (2.1.6) artifactory mixlib-shellout mixlib-versioning |