diff options
author | Lamont Granquist <lamont@scriptkiddie.org> | 2016-01-29 09:12:10 -0800 |
---|---|---|
committer | Lamont Granquist <lamont@scriptkiddie.org> | 2016-01-29 09:12:10 -0800 |
commit | 48349f9819752e0a241d5a3259a213bc26f3eb5a (patch) | |
tree | a31f0d1340d3bd70d9261f337ebd37d8cb5765e9 | |
parent | 673c0a74a97a47c168d55758b661a51ba33ee519 (diff) | |
download | chef-48349f9819752e0a241d5a3259a213bc26f3eb5a.tar.gz |
remove ruby optimization entirely for linux
-rw-r--r-- | omnibus/Gemfile | 4 | ||||
-rw-r--r-- | omnibus/Gemfile.lock | 18 |
2 files changed, 12 insertions, 10 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile index 12001d1c17..58f69e723e 100644 --- a/omnibus/Gemfile +++ b/omnibus/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" -gem "omnibus", github: "chef/omnibus" -gem "omnibus-software", github: "chef/omnibus-software" +gem "omnibus", github: "chef/omnibus", branch: "lcg/ruby-opts" +gem "omnibus-software", github: "chef/omnibus-software", branch: "lcg/ruby-opts" # This development group is installed by default when you run `bundle install`, # but if you are using Omnibus in a CI-based infrastructure, you do not need diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 8bdfdcdff1..bc467bd444 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,12 +1,14 @@ GIT remote: git://github.com/chef/omnibus-software.git - revision: 45fc26cf6b4692860bd44dc154c690e1e9265870 + revision: 8dd71cd439b6cc94cab746b1d208b144c8fec2d1 + branch: lcg/ruby-opts specs: omnibus-software (4.0.0) GIT remote: git://github.com/chef/omnibus.git - revision: 884a22a0d25edb9193947e411a0a9a4047e662d4 + revision: d760c91e1b1456b333c3fdbf311c2c6a95395d97 + branch: lcg/ruby-opts specs: omnibus (5.0.0) aws-sdk (~> 2) @@ -22,12 +24,12 @@ GEM remote: https://rubygems.org/ specs: addressable (2.3.8) - aws-sdk (2.2.13) - aws-sdk-resources (= 2.2.13) - aws-sdk-core (2.2.13) + aws-sdk (2.2.14) + aws-sdk-resources (= 2.2.14) + aws-sdk-core (2.2.14) jmespath (~> 1.0) - aws-sdk-resources (2.2.13) - aws-sdk-core (= 2.2.13) + aws-sdk-resources (2.2.14) + aws-sdk-core (= 2.2.14) berkshelf (3.2.4) addressable (~> 2.3.4) berkshelf-api-client (~> 1.2) @@ -115,7 +117,7 @@ GEM nori (2.6.0) octokit (3.8.0) sawyer (~> 0.6.0, >= 0.5.3) - ohai (8.8.1) + ohai (8.9.0) chef-config (>= 12.5.0.alpha.1, < 13) ffi (~> 1.9) ffi-yajl (~> 2.2) |