summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Hain <shain@chef.io>2016-04-05 12:15:32 -0700
committerScott Hain <shain@chef.io>2016-04-05 12:15:32 -0700
commit5ff63e4e02d8fe607a949ba6cd78ce5c4017ce03 (patch)
tree227568cc86efe2a4ecf58971355baf18270411a2
parent1446ee9adc2f390b4ecdfa28465ef1dc0f1e53a5 (diff)
downloadchef-shain/power_upd.tar.gz
Fix json pinshain/power_upd
-rw-r--r--omnibus/Gemfile6
1 files changed, 6 insertions, 0 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index 89fed41c8d..c144387519 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -7,6 +7,12 @@ gem "omnibus-software", git: "https://github.com/chef/omnibus-software.git", bra
# 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 ChefDK 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