diff options
| author | Claire McQuin <claire@getchef.com> | 2015-07-24 12:17:30 -0700 |
|---|---|---|
| committer | Claire McQuin <claire@getchef.com> | 2015-08-07 12:03:28 -0700 |
| commit | b882a1c1b9a746e76535915e9ecf0d4d4185dd6f (patch) | |
| tree | 1810dca8a1034b673b7d6db499970492432155a2 | |
| parent | b34f65e313c282926967093904d04dd248a6cd83 (diff) | |
| download | chef-b882a1c1b9a746e76535915e9ecf0d4d4185dd6f.tar.gz | |
Use 8.6 alpha gem of ohai
| -rw-r--r-- | Gemfile | 5 | ||||
| -rw-r--r-- | chef.gemspec | 2 |
2 files changed, 1 insertions, 6 deletions
@@ -5,11 +5,6 @@ gem "activesupport", "< 4.0.0", :group => :compat_testing, :platform => "ruby" gem 'chef-config', path: "chef-config" -# REMOVEME once there is a release of Ohai with these changes, and the -# chef.gemspec is updated. -gem 'ohai', github: 'chef/ohai', - ref: '7556a1d55808c459f3a9fad88e2a2371f361f3e0' - group(:docgen) do gem "tomlrb" gem "yard" diff --git a/chef.gemspec b/chef.gemspec index 4df2bf4196..6361fb42f5 100644 --- a/chef.gemspec +++ b/chef.gemspec @@ -21,7 +21,7 @@ Gem::Specification.new do |s| s.add_dependency "mixlib-log", "~> 1.3" s.add_dependency "mixlib-authentication", "~> 1.3" s.add_dependency "mixlib-shellout", ">= 2.0.0.rc.0", "< 3.0" - # s.add_dependency "ohai", "~> 8.0" + s.add_dependency "ohai", ">= 8.6.0.alpha.1", "< 9" s.add_dependency "ffi-yajl", "~> 2.2" s.add_dependency "net-ssh", "~> 2.6" |