summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorThom May <thom@chef.io>2018-02-14 12:22:41 +0000
committerThom May <thom@chef.io>2018-03-19 21:36:23 +0000
commit94222a8a0a1cda16d35c8f08c731a3f902449391 (patch)
tree712169a375dbf411ebfa4f205727840db279d404 /Gemfile
parent7e11a4192df63ecc0166a947109878cc0070434a (diff)
downloadchef-94222a8a0a1cda16d35c8f08c731a3f902449391.tar.gz
Add the ability to inject log objectstm/inject_log
meaning that we can have inheritable metadata Signed-off-by: Thom May <thom@chef.io>
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile5
1 files changed, 1 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index 81109eb6f5..b699dca975 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,11 +7,8 @@ source "https://rubygems.org"
# of bundler versions prior to 1.12.0 (https://github.com/bundler/bundler/commit/193a14fe5e0d56294c7b370a0e59f93b2c216eed)
gem "chef", path: "."
-# @todo before shipping 14.0 we need to switch this over to a gem again
-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", "~> 13" # required for rspec tests
+gem "cheffish", "~> 14"
group(:omnibus_package) do
gem "appbundler"