summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-10-26 12:45:32 -0700
committerTim Smith <tsmith@chef.io>2018-10-26 12:45:32 -0700
commit5836a4cd4b35d8fa8843c75b3a6aea990b89ba0a (patch)
tree89956dbdac0494864b3907db270bdfb634aa1d08 /Gemfile
parent8f97c84db49b62a77667afda672cccb0e1cb41bd (diff)
downloadchef-5836a4cd4b35d8fa8843c75b3a6aea990b89ba0a.tar.gz
Pull ohai from github so we can relax the chef-config dep
Ohai has a ceiling on the chef-config version it will accept. I just kicked master to ohai 15 in the ohai repo. Pulling from master should allow this all to work now. Signed-off-by: Tim Smith <tsmith@chef.io>
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile3
1 files changed, 3 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index 91cf837a90..a3e020b4c3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,6 +7,9 @@ source "https://rubygems.org"
# of bundler versions prior to 1.12.0 (https://github.com/bundler/bundler/commit/193a14fe5e0d56294c7b370a0e59f93b2c216eed)
gem "chef", path: "."
+# necessary until we release ohai 15
+gem "ohai", git: "https://github.com/chef/ohai.git", branch: "master"
+
gem "chef-config", path: File.expand_path("../chef-config", __FILE__) if File.exist?(File.expand_path("../chef-config", __FILE__))
gem "cheffish", "~> 14"