diff options
| author | Tyler Ball <tyler-ball@users.noreply.github.com> | 2016-04-05 15:13:01 -0600 |
|---|---|---|
| committer | Tyler Ball <tyler-ball@users.noreply.github.com> | 2016-04-05 15:13:01 -0600 |
| commit | dcbc6728e0df98f72860db47151de8ee209bc62c (patch) | |
| tree | 32e9173615800d3acf4bbee43f02373f25cc48f1 | |
| parent | dcdc6a36ccd7c98417ae579bb7a937b6172334a7 (diff) | |
| parent | fbb2cb5e0c9e907a92801a816bb8e9ddc019f733 (diff) | |
| download | chef-dcbc6728e0df98f72860db47151de8ee209bc62c.tar.gz | |
Merge pull request #4802 from chef/shain/use_correct_json
Explicitly pin json gem
| -rw-r--r-- | omnibus/Gemfile | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile index ef1dec354d..295fb2f490 100644 --- a/omnibus/Gemfile +++ b/omnibus/Gemfile @@ -7,6 +7,12 @@ gem "omnibus-software", git: "https://github.com/chef/omnibus-software.git" # bundler very unhappy. Remove this when upstream has merged zed-0xff/pedump#6 . gem "pedump", git: "https://github.com/ksubrama/pedump.git", branch: "patch-1" +# `json_pure` has a bug in it that is failing Chef builds. We include the +# json gem into the Gemfile so that running `bundle exec` will have +# this gem on the load path, and cause `require 'json/ext'` to succeed. This +# prevents loading the `json_pure` gem +gem "json", ">= 1.8.1" + # 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 # the Test Kitchen-based build lab. You can skip these unnecessary dependencies |