diff options
| author | tyler-ball <tyleraball@gmail.com> | 2016-04-08 13:09:56 -0500 |
|---|---|---|
| committer | tyler-ball <tyleraball@gmail.com> | 2016-04-11 11:24:20 -0500 |
| commit | ce52520102449482808fcb61f1f6bea822e6d71f (patch) | |
| tree | 646d88286a19c1ecf5d5e4035235189d88292a40 | |
| parent | e7d602b1225041b5f2815dab235bba901dd8d341 (diff) | |
| download | chef-ce52520102449482808fcb61f1f6bea822e6d71f.tar.gz | |
Omnibus is now using ffi_yajl so we no longer need to pin the JSON gem in our Gemfile
| -rw-r--r-- | omnibus/Gemfile | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile index 295fb2f490..ef1dec354d 100644 --- a/omnibus/Gemfile +++ b/omnibus/Gemfile @@ -7,12 +7,6 @@ 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 |