summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2018-12-05 03:15:34 +0000
committerChef Expeditor <chef-ci@chef.io>2018-12-05 03:15:34 +0000
commit79d9111b0171312c0a6e065f3a4de5b53bc1ecf5 (patch)
tree89bf65b8c5e1edcb624ab8c79687886cec9046a1
parentfb76775e6f60a8e94cee60538d98e9dfbbf87934 (diff)
downloadchef-79d9111b0171312c0a6e065f3a4de5b53bc1ecf5.tar.gz
Bump version to 15.0.97 by Chef Expeditorv15.0.97
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock14
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 14 insertions, 13 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index df3ee0b76c..51bea2edf6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.0.96 -->
-## [v15.0.96](https://github.com/chef/chef/tree/v15.0.96) (2018-11-30)
+<!-- latest_release 15.0.97 -->
+## [v15.0.97](https://github.com/chef/chef/tree/v15.0.97) (2018-12-05)
#### Merged Pull Requests
-- RHEL8 yum_package fix. [#8005](https://github.com/chef/chef/pull/8005) ([lamont-granquist](https://github.com/lamont-granquist))
+- Pin the ohai definition to use the ohai version from Gemfile.lock [#8012](https://github.com/chef/chef/pull/8012) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup -->
### Changes since latest stable release
#### Merged Pull Requests
+- Pin the ohai definition to use the ohai version from Gemfile.lock [#8012](https://github.com/chef/chef/pull/8012) ([tas50](https://github.com/tas50)) <!-- 15.0.97 -->
- RHEL8 yum_package fix. [#8005](https://github.com/chef/chef/pull/8005) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.0.96 -->
- package resource: Add RHEL 8 support to DNF package installer [#8003](https://github.com/chef/chef/pull/8003) ([pixdrift](https://github.com/pixdrift)) <!-- 15.0.95 -->
- Initial suppport for snap packages [#7999](https://github.com/chef/chef/pull/7999) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.0.94 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index fea970ac89..c94a3f5f76 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,10 +8,10 @@ GIT
GIT
remote: https://github.com/chef/ohai.git
- revision: 878d3ff1eb9998ee921d599aafed27ded235695e
+ revision: 8e3ff7e496ecd1f5890e27f552741b731f72b34c
branch: master
specs:
- ohai (15.0.14)
+ ohai (15.0.20)
chef-config (>= 12.8, < 16)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
@@ -27,10 +27,10 @@ GIT
PATH
remote: .
specs:
- chef (15.0.96)
+ chef (15.0.97)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.96)
+ chef-config (= 15.0.97)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -57,10 +57,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (15.0.96-universal-mingw32)
+ chef (15.0.97-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.96)
+ chef-config (= 15.0.97)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -104,7 +104,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (15.0.96)
+ chef-config (15.0.97)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index 73119ad422..297d1098f5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.96 \ No newline at end of file
+15.0.97 \ No newline at end of file
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 6644877fd1..0524cfc3fd 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -21,7 +21,7 @@
module ChefConfig
CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "15.0.96".freeze
+ VERSION = "15.0.97".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index e8d1fb21ea..04cc349ede 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require "chef/version_string"
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = Chef::VersionString.new("15.0.96")
+ VERSION = Chef::VersionString.new("15.0.97")
end
#