summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock10
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 12 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c828058a6f..433cd640a4 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.196 -->
-## [v15.0.196](https://github.com/chef/chef/tree/v15.0.196) (2019-03-19)
+<!-- latest_release 15.0.197 -->
+## [v15.0.197](https://github.com/chef/chef/tree/v15.0.197) (2019-03-27)
#### Merged Pull Requests
-- Update chef-zero to 14.0.12 [#8312](https://github.com/chef/chef/pull/8312) ([tas50](https://github.com/tas50))
+- Update win32-service gem and fix #8195 [#8322](https://github.com/chef/chef/pull/8322) ([jasonwbarnett](https://github.com/jasonwbarnett))
<!-- latest_release -->
<!-- release_rollup -->
### Changes since latest stable release
#### Merged Pull Requests
+- Update win32-service gem and fix #8195 [#8322](https://github.com/chef/chef/pull/8322) ([jasonwbarnett](https://github.com/jasonwbarnett)) <!-- 15.0.197 -->
- Update chef-zero to 14.0.12 [#8312](https://github.com/chef/chef/pull/8312) ([tas50](https://github.com/tas50)) <!-- 15.0.196 -->
- Remove the travis gem from our gemfile [#8310](https://github.com/chef/chef/pull/8310) ([tas50](https://github.com/tas50)) <!-- 15.0.195 -->
- Pin expeditor to ruby 2.5.3 and bump train to 1.7.6 [#8308](https://github.com/chef/chef/pull/8308) ([tas50](https://github.com/tas50)) <!-- 15.0.193 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index dc66beb664..488a146cc3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,10 +27,10 @@ GIT
PATH
remote: .
specs:
- chef (15.0.196)
+ chef (15.0.197)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.196)
+ chef-config (= 15.0.197)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -51,10 +51,10 @@ PATH
proxifier (~> 1.0)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (15.0.196-universal-mingw32)
+ chef (15.0.197-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.196)
+ chef-config (= 15.0.197)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -92,7 +92,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (15.0.196)
+ chef-config (15.0.197)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index 1d57c7d1e4..ea372d5e59 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.196 \ No newline at end of file
+15.0.197 \ 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 a08765dace..ec850353c0 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.196".freeze
+ VERSION = "15.0.197".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index d39e7bced3..2bc333fc3d 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.196")
+ VERSION = Chef::VersionString.new("15.0.197")
end
#