diff options
| author | Tim Smith <tsmith@chef.io> | 2018-10-26 12:33:12 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith@chef.io> | 2018-10-26 12:33:12 -0700 |
| commit | 84ff1a2fb0fc2ec67a04094161509133b83590ae (patch) | |
| tree | 8acb226fcc01ba17ab39d1e7f78e6c5f46e99cec | |
| parent | a890a164dc3128137203b9a5bd1b4d5c86a0da54 (diff) | |
| download | ohai-84ff1a2fb0fc2ec67a04094161509133b83590ae.tar.gz | |
Update master branch for Ohai 15 development
This is necessary before we can start Chef 15 development.
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | .expeditor/config.yml | 2 | ||||
| -rw-r--r-- | RELEASE_NOTES.md | 4 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | lib/ohai/version.rb | 2 | ||||
| -rw-r--r-- | ohai.gemspec | 2 |
5 files changed, 9 insertions, 3 deletions
diff --git a/.expeditor/config.yml b/.expeditor/config.yml index d1a9640a..5250587d 100644 --- 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 index 30ea9f52..c6feab65 100644 --- 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 @@ -1 +1 @@ -14.6.2
\ No newline at end of file +15.0.0 diff --git a/lib/ohai/version.rb b/lib/ohai/version.rb index fa9c0f45..bb7d34b4 100644 --- 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 index 9be8629b..34680611 100644 --- 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. |