diff options
| -rw-r--r-- | .expeditor/config.yml | 2 | ||||
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | chef.gemspec | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/.expeditor/config.yml b/.expeditor/config.yml index e91343a89e..c5b5c83e06 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -60,6 +60,8 @@ github: # for building. release_branch: - master: + version_constraint: 16* + - chef-15: version_constraint: 15* - chef-14: version_constraint: 14* @@ -7,7 +7,6 @@ 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-utils", path: File.expand_path("../chef-utils", __FILE__) if File.exist?(File.expand_path("../chef-utils", __FILE__)) @@ -1 +1 @@ -15.7.24
\ No newline at end of file +16.0.0
\ No newline at end of file diff --git a/chef.gemspec b/chef.gemspec index 3e2928d504..881dbb55ec 100644 --- a/chef.gemspec +++ b/chef.gemspec @@ -26,7 +26,7 @@ Gem::Specification.new do |s| s.add_dependency "mixlib-authentication", ">= 2.1", "< 4" s.add_dependency "mixlib-shellout", ">= 3.0.3", "< 4.0" s.add_dependency "mixlib-archive", ">= 0.4", "< 2.0" - s.add_dependency "ohai", "~> 15.0" + s.add_dependency "ohai", "~> 16.0" s.add_dependency "ffi", "~> 1.9", ">= 1.9.25" s.add_dependency "ffi-yajl", "~> 2.2" |