Merge pull request #1277 from chef/prep-15

Update master branch for Ohai 15 development
chef · Oct 26, 2018 · 8f22c3f · 8f22c3f
2 parents a890a16 + 84ff1a2
commit 8f22c3f
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/.expeditor/config.yml b/.expeditor/config.yml
@@ -20,6 +20,8 @@ github:
   # for building.
   release_branch:
     - master:
+        version_constraint: 15.*
+    - 14-stable:
         version_constraint: 14.*
     - 13-stable:
         version_constraint: 13.*

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,7 @@
+# Unreleased (Ohai 15)
+
+This will be updated as the development of Ohai 15 progresses.
+
 # Ohai Release Notes 14.6
 
 ## Filesystem Plugin on AIX and Solaris

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-14.6.2
+15.0.0
diff --git a/lib/ohai/version.rb b/lib/ohai/version.rb
@@ -18,5 +18,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = "14.6.2".freeze
+  VERSION = "15.0.0".freeze
 end
diff --git a/ohai.gemspec b/ohai.gemspec
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency "ipaddress"
   s.add_dependency "wmi-lite", "~> 1.0"
   s.add_dependency "ffi", "~> 1.9"
-  s.add_dependency "chef-config", ">= 12.8", "< 15"
+  s.add_dependency "chef-config", ">= 12.8", "< 16"
   # Note for ohai developers: If chef-config causes you grief, try:
   #     bundle install --with development
   # this should work as long as chef is a development dependency in Gemfile.