summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md6
-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, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c4bfe292e..5624f05755 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
This changelog reflects the current state of chef's master branch on github and may not reflect the current released version of chef, which is [![Gem Version](https://badge.fury.io/rb/chef.svg)](https://badge.fury.io/rb/chef).
-## [v12.17.41](https://github.com/chef/chef/tree/v12.17.41) (2016-12-06)
-[Full Changelog](https://github.com/chef/chef/compare/v12.16.42...v12.17.41)
+## [v12.17.42](https://github.com/chef/chef/tree/v12.17.42) (2016-12-06)
+[Full Changelog](https://github.com/chef/chef/compare/v12.16.42...v12.17.42)
**Implemented enhancements:**
@@ -23,6 +23,7 @@ This changelog reflects the current state of chef's master branch on github and
- The suggested fix for the manage\_home deprecation is incorrect [\#5615](https://github.com/chef/chef/pull/5615) ([tas50](https://github.com/tas50))
- change choco -version to choco --version [\#5613](https://github.com/chef/chef/pull/5613) ([spuder](https://github.com/spuder))
- Knife: Correct example `chef\_server\_url` in `knife configure` [\#5602](https://github.com/chef/chef/pull/5602) ([jerryaldrichiii](https://github.com/jerryaldrichiii))
+- Ensures correct version of shutdown is called when using the reboot resource on Windows [\#5596](https://github.com/chef/chef/pull/5596) ([Xoph](https://github.com/Xoph))
- Windows: Support for running cab\_package on non-English system locales [\#5591](https://github.com/chef/chef/pull/5591) ([jugatsu](https://github.com/jugatsu))
- Core: Ensure Data Collector resource report exists before updating [\#5571](https://github.com/chef/chef/pull/5571) ([adamleff](https://github.com/adamleff))
- Windows: Use the full path to expand.exe for msu\_package [\#5564](https://github.com/chef/chef/pull/5564) ([NimishaS](https://github.com/NimishaS))
@@ -34,6 +35,7 @@ This changelog reflects the current state of chef's master branch on github and
**Closed issues:**
+- reboot! does not work well with Tomcat [\#5594](https://github.com/chef/chef/issues/5594)
- cab\_package doesn't support running on non-English system locales [\#5592](https://github.com/chef/chef/issues/5592)
- Support restarting/stopping/ the service from state paused on windows [\#5586](https://github.com/chef/chef/issues/5586)
diff --git a/Gemfile.lock b/Gemfile.lock
index c49945656d..f096c1773d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -47,10 +47,10 @@ GIT
PATH
remote: .
specs:
- chef (12.17.41)
+ chef (12.17.42)
addressable
bundler (>= 1.10)
- chef-config (= 12.17.41)
+ chef-config (= 12.17.42)
chef-zero (>= 4.8)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -76,10 +76,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (12.17.41-universal-mingw32)
+ chef (12.17.42-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 12.17.41)
+ chef-config (= 12.17.42)
chef-zero (>= 4.8)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -120,7 +120,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (12.17.41)
+ chef-config (12.17.42)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 3eaba80a5e..33dbcdaaea 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.17.41 \ No newline at end of file
+12.17.42 \ 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 f037598f14..7fafc3d36a 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 = "12.17.41"
+ VERSION = "12.17.42"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 73e13819e9..685069cc90 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -21,7 +21,7 @@
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "12.17.41"
+ VERSION = "12.17.42"
end
#