Merge pull request #6226 from chef/tm/12_21v12.21.0

Release 12.21.0

10 files changed, 171 insertions, 113 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eee5891f86..d81ced5412 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,14 @@
-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).
+This changelog reflects the current state of chef's 12 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.21.0](https://github.com/chef/chef/tree/v12.21.0) (2017-06-19)
+[Full Changelog](https://github.com/chef/chef/compare/v12.20.3...v12.21.0)
+
+**Fixed bugs:**
+
+- Special case for the supports pseudo-property for Chef 12 [\#6222](https://github.com/chef/chef/pull/6222) ([coderanger](https://github.com/coderanger))
+- Backport error info for Chef 12 [\#6173](https://github.com/chef/chef/pull/6173) ([coderanger](https://github.com/coderanger))
+- Prefer Systemd with sysvinit script over Upstart for service provider [\#6157](https://github.com/chef/chef/pull/6157) ([shortdudey123](https://github.com/shortdudey123))
+- Discard caches for files not in the manifest [\#6129](https://github.com/chef/chef/pull/6129) ([akitada](https://github.com/akitada))
 
 ## [v12.20.2](https://github.com/chef/chef/tree/v12.20.2) (2017-03-07)
 [Full Changelog](https://github.com/chef/chef/compare/v12.19.36...v12.20.2)
diff --git a/Gemfile b/Gemfile
index b3fa6b01a3..7d76befbab 100644
--- a/Gemfile
+++ b/Gemfile
@@ -19,7 +19,7 @@ gem "cheffish" # required for rspec tests
 group(:omnibus_package) do
   gem "appbundler"
   gem "rb-readline"
-  gem "nokogiri"
+  gem "nokogiri", "~> 1.7.2"
 end
 
 group(:omnibus_package, :pry) do
diff --git a/Gemfile.lock b/Gemfile.lock
index f33320cded..35301c92ed 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -16,7 +16,7 @@ GIT
 
 GIT
   remote: https://github.com/chef/chefstyle.git
-  revision: 7e47afd6141d3c44a11322916e3fc85c89aa9b59
+  revision: 69c1c0d07aa4613bcdc3454767c9fb0d5ee9b36b
   branch: master
   specs:
     chefstyle (0.5.0)
@@ -46,11 +46,11 @@ GIT
 PATH
   remote: .
   specs:
-    chef (12.20.3)
+    chef (12.21.0)
       addressable
       bundler (>= 1.10)
-      chef-config (= 12.20.3)
-      chef-zero (>= 4.8)
+      chef-config (= 12.21.0)
+      chef-zero (>= 4.8, < 13)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
       ffi-yajl (~> 2.2)
@@ -75,11 +75,11 @@ PATH
       specinfra (~> 2.10)
       syslog-logger (~> 1.6)
       uuidtools (~> 2.1.5)
-    chef (12.20.3-universal-mingw32)
+    chef (12.21.0-universal-mingw32)
       addressable
       bundler (>= 1.10)
-      chef-config (= 12.20.3)
-      chef-zero (>= 4.8)
+      chef-config (= 12.21.0)
+      chef-zero (>= 4.8, < 13)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
       ffi (~> 1.9)
@@ -119,7 +119,7 @@ PATH
 PATH
   remote: chef-config
   specs:
-    chef-config (12.20.3)
+    chef-config (12.21.0)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
@@ -128,7 +128,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.0.1)
+    activesupport (5.1.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
@@ -136,17 +136,18 @@ GEM
     addressable (2.4.0)
     appbundler (0.10.0)
       mixlib-cli (~> 1.4)
-    artifactory (2.6.0)
+    artifactory (2.8.2)
     ast (2.3.0)
-    aws-sdk (2.7.7)
-      aws-sdk-resources (= 2.7.7)
-    aws-sdk-core (2.7.7)
+    awesome_print (1.8.0)
+    aws-sdk (2.9.43)
+      aws-sdk-resources (= 2.9.43)
+    aws-sdk-core (2.9.43)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.7.7)
-      aws-sdk-core (= 2.7.7)
+    aws-sdk-resources (2.9.43)
+      aws-sdk-core (= 2.9.43)
     aws-sigv4 (1.0.0)
-    backports (3.6.8)
+    backports (3.8.0)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
     builder (3.2.3)
@@ -154,36 +155,38 @@ GEM
     chef-api (0.7.0)
       logify (~> 0.1)
       mime-types
-    chef-provisioning (2.1.0)
-      cheffish (~> 4.0)
+    chef-provisioning (2.3.2)
+      cheffish (>= 4.0, < 14.0)
       inifile (>= 2.0.2)
       mixlib-install (>= 1.0, < 3.0)
       net-scp (~> 1.0)
       net-ssh (>= 2.9, < 5.0)
       net-ssh-gateway (~> 1.2)
+      winrm (~> 2.0)
+      winrm-elevated (~> 1.0)
       winrm-fs (~> 1.0)
     chef-sugar (3.4.0)
-    chef-zero (5.3.0)
+    chef-zero (5.3.2)
       ffi-yajl (~> 2.2)
       hashie (>= 2.0, < 4.0)
       mixlib-log (~> 1.3)
       rack (~> 2.0)
       uuidtools (~> 2.1)
-    cheffish (4.1.1)
+    cheffish (5.0.1)
       chef-zero (~> 5.0)
       net-ssh
-    chefspec (5.4.0)
-      chef (>= 12.0)
-      fauxhai (~> 3.6)
+    chefspec (7.1.0)
+      chef (>= 12.14.89)
+      fauxhai (>= 4, < 6)
       rspec (~> 3.0)
-    codeclimate-test-reporter (0.6.0)
-      simplecov (>= 0.7.1, < 1.0.0)
-    codecov (0.1.9)
+    codeclimate-test-reporter (1.0.8)
+      simplecov (<= 0.13)
+    codecov (0.1.10)
       json
       simplecov
       url
     coderay (1.1.1)
-    concurrent-ruby (1.0.4)
+    concurrent-ruby (1.0.5)
     cucumber (2.4.0)
       builder (>= 2.1.2)
       cucumber-core (~> 1.5.0)
@@ -195,30 +198,30 @@ GEM
     cucumber-core (1.5.0)
       gherkin (~> 4.0)
     cucumber-wire (0.0.1)
-    debug_inspector (0.0.2)
+    debug_inspector (0.0.3)
     diff-lcs (1.3)
     docile (1.1.5)
-    domain_name (0.5.20161129)
+    domain_name (0.5.20170404)
       unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
     ethon (0.10.1)
       ffi (>= 1.3.0)
-    excon (0.55.0)
-    faraday (0.11.0)
+    excon (0.57.0)
+    faraday (0.12.1)
       multipart-post (>= 1.2, < 3)
     faraday-http-cache (2.0.0)
       faraday (~> 0.8)
     faraday_middleware (0.11.0.1)
       faraday (>= 0.7.4, < 1.0)
-    fauxhai (3.10.0)
+    fauxhai (5.0.0)
       net-ssh
-    ffi (1.9.17)
-    ffi (1.9.17-x86-mingw32)
+    ffi (1.9.18)
+    ffi (1.9.18-x86-mingw32)
     ffi-win32-extensions (1.0.3)
       ffi
     ffi-yajl (2.3.0)
       libyajl2 (~> 1.2)
-    foodcritic (8.2.0)
+    foodcritic (11.2.0)
       cucumber-core (>= 1.3)
       erubis
       nokogiri (>= 1.5, < 2.0)
@@ -230,47 +233,48 @@ GEM
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
     fuzzyurl (0.9.0)
-    gh (0.15.0)
+    gh (0.15.1)
       addressable (~> 2.4.0)
       backports
       faraday (~> 0.8)
       multi_json (~> 1.0)
       net-http-persistent (~> 2.9)
       net-http-pipeline
-    gherkin (4.0.0)
+    gherkin (4.1.3)
     git (1.3.0)
     gssapi (1.2.0)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
       builder (>= 2.1.2)
-    halite (1.4.0)
+    halite (1.7.0)
       bundler
-      chef (~> 12.0)
-      stove (~> 4.0)
+      chef (>= 12.0, < 14.0)
+      stove (~> 5.0)
       thor
-    hashie (3.5.3)
+    hashie (3.5.5)
     highline (1.7.8)
+    hirb (0.7.3)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (0.8.0)
+    i18n (0.8.4)
     inifile (3.0.0)
-    iniparse (1.4.2)
+    iniparse (1.4.3)
     ipaddress (0.8.3)
     jmespath (1.3.1)
-    json (2.0.3)
+    json (2.1.0)
     kitchen-docker (2.6.0)
       test-kitchen (>= 1.0.0)
-    kitchen-ec2 (1.3.0)
+    kitchen-ec2 (1.3.2)
       aws-sdk (~> 2)
       excon
       multi_json
       retryable (~> 2.0)
       test-kitchen (~> 1.4, >= 1.4.1)
-    kitchen-sync (2.1.2)
+    kitchen-sync (2.2.0)
       net-sftp
       test-kitchen (>= 1.0.0)
-    kitchen-vagrant (1.0.1)
+    kitchen-vagrant (1.1.0)
       test-kitchen (~> 1.4)
     knife-windows (1.9.0)
       winrm (~> 2.1)
@@ -279,7 +283,7 @@ GEM
       addressable (~> 2.3)
     libyajl2 (1.2.0)
     little-plugger (1.1.4)
-    logging (2.1.0)
+    logging (2.2.2)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
     logify (0.2.0)
@@ -288,7 +292,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
-    minitest (5.10.1)
+    minitest (5.10.2)
     mixlib-archive (0.4.1)
       mixlib-log
     mixlib-authentication (1.4.1)
@@ -316,7 +320,7 @@ GEM
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (4.0.1)
+    net-ssh (4.1.0)
     net-ssh-gateway (1.3.0)
       net-ssh (>= 2.6.5)
     net-ssh-multi (1.2.1)
@@ -324,15 +328,15 @@ GEM
       net-ssh-gateway (>= 1.2.0)
     net-telnet (0.1.1)
     netrc (0.11.0)
-    nokogiri (1.7.0.1)
+    nokogiri (1.7.2)
       mini_portile2 (~> 2.1.0)
-    nokogiri (1.7.0.1-x86-mingw32)
+    nokogiri (1.7.2-x86-mingw32)
       mini_portile2 (~> 2.1.0)
     nori (2.6.0)
-    octokit (4.6.2)
+    octokit (4.7.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ohai (8.23.0)
-      chef-config (>= 12.5.0.alpha.1, < 13)
+    ohai (8.24.0)
+      chef-config (>= 12.5.0.alpha.1, < 14)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
       ipaddress
@@ -343,20 +347,24 @@ GEM
       plist (~> 3.1)
       systemu (~> 2.6.4)
       wmi-lite (~> 1.0)
+    paint (2.0.0)
     parser (2.4.0.0)
       ast (~> 2.2)
-    plist (3.2.0)
-    poise (2.7.2)
+    plist (3.3.0)
+    poise (2.8.1)
+      chef (>= 12, < 14)
       halite (~> 1.0)
-    poise-boiler (1.13.2)
+    poise-boiler (1.16.0)
+      awesome_print
       bundler
-      chefspec (~> 5.0)
-      codeclimate-test-reporter (~> 0.4)
+      chefspec (>= 5, < 8)
+      codeclimate-test-reporter (~> 1.0)
       codecov (~> 0.0, >= 0.0.2)
-      foodcritic (>= 7, < 9)
+      foodcritic (>= 7, < 12)
       fuubar (~> 2.0)
       git (~> 1.2)
-      halite (~> 1.2)
+      halite (~> 1.6)
+      hirb
       kitchen-docker (>= 2.6.0.rc.0)
       kitchen-ec2 (~> 1.0)
       kitchen-sync (~> 2.1)
@@ -365,7 +373,7 @@ GEM
       poise-profiler (~> 1.0)
       pry
       pry-byebug
-      rake (>= 10.4, < 12.0)
+      rake (>= 10.4, < 13)
       rspec (~> 3.2)
       rspec-its (~> 1.2)
       simplecov (~> 0.9)
@@ -374,9 +382,10 @@ GEM
       vagrant-wrapper
       winrm (>= 1.6, < 3)
       winrm-fs (>= 0.4, < 2)
+      wirb
       yard (~> 0.8)
       yard-classmethods (~> 1.0)
-    poise-profiler (1.0.1)
+    poise-profiler (1.1.0)
       halite (~> 1.0)
     polyglot (0.3.5)
     powerpack (0.1.1)
@@ -397,39 +406,40 @@ GEM
     pusher-client (0.6.2)
       json
       websocket (~> 1.0)
-    rack (2.0.1)
-    rainbow (2.2.1)
-    rake (11.3.0)
+    rack (2.0.3)
+    rainbow (2.2.2)
+      rake
+    rake (12.0.0)
     rb-readline (0.5.4)
-    rest-client (2.0.0)
+    rest-client (2.0.2)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rest-client (2.0.0-x86-mingw32)
+    rest-client (2.0.2-x86-mingw32)
       ffi (~> 1.9)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    retriable (3.0.0)
+    retriable (3.0.2)
     retryable (2.0.4)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
+      rspec-support (~> 3.6.0)
     rspec-its (1.2.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.5.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
+      rspec-support (~> 3.6.0)
     rspec-rerun (1.1.0)
       rspec (~> 3.0)
-    rspec-support (3.5.0)
+    rspec-support (3.6.0)
     rspec_junit_formatter (0.2.3)
       builder (< 4)
       rspec-core (>= 2, < 4, != 2.12.0)
@@ -442,47 +452,47 @@ GEM
     ruby-prof (0.16.2)
     ruby-progressbar (1.8.1)
     ruby-shadow (2.5.0)
-    rubyntlm (0.6.1)
+    rubyntlm (0.6.2)
     rubyzip (1.2.1)
     rufus-lru (1.1.0)
     safe_yaml (1.0.4)
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
-    serverspec (2.38.0)
+    serverspec (2.39.1)
       multi_json
       rspec (~> 3.0)
       rspec-its
-      specinfra (~> 2.53)
+      specinfra (~> 2.68)
     sfl (2.3)
     simplecov (0.13.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
+    simplecov-html (0.10.1)
     slop (3.6.0)
-    specinfra (2.66.9)
+    specinfra (2.68.0)
       net-scp
       net-ssh (>= 2.7, < 5.0)
       net-telnet
       sfl
-    stove (4.1.1)
+    stove (5.2.0)
       chef-api (~> 0.5)
       logify (~> 0.2)
     syslog-logger (1.6.8)
     systemu (2.6.5)
-    test-kitchen (1.15.0)
+    test-kitchen (1.16.0)
       mixlib-install (>= 1.2, < 3.0)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
       net-ssh (>= 2.9, < 5.0)
       net-ssh-gateway (~> 1.2)
       safe_yaml (~> 1.0)
-      thor (~> 0.18)
-    thor (0.19.4)
-    thread_safe (0.3.5)
-    tomlrb (1.2.3)
-    travis (1.8.6)
+      thor (~> 0.19, < 0.19.2)
+    thor (0.19.1)
+    thread_safe (0.3.6)
+    tomlrb (1.2.4)
+    travis (1.8.8)
       backports
       faraday (~> 0.9)
       faraday_middleware (~> 0.9, >= 0.9.1)
@@ -495,13 +505,13 @@ GEM
       polyglot (~> 0.3)
     typhoeus (0.8.0)
       ethon (>= 0.8.0)
-    tzinfo (1.2.2)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.2)
-    unf_ext (0.0.7.2-x86-mingw32)
-    unicode-display_width (1.1.3)
+    unf_ext (0.0.7.4)
+    unf_ext (0.0.7.4-x86-mingw32)
+    unicode-display_width (1.2.1)
     url (0.3.2)
     uuidtools (2.1.5)
     vagrant-wrapper (2.0.3)
@@ -526,7 +536,7 @@ GEM
       ffi-win32-extensions
     windows-api (0.4.4)
       win32-api (>= 1.4.5)
-    winrm (2.1.2)
+    winrm (2.2.3)
       builder (>= 2.1.2)
       erubis (~> 2.7)
       gssapi (~> 1.2)
@@ -543,9 +553,11 @@ GEM
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 1.1)
       winrm (~> 2.0)
+    wirb (2.1.1)
+      paint (>= 0.9, < 3.0)
     wmi-lite (1.0.0)
     yajl-ruby (1.3.0)
-    yard (0.9.8)
+    yard (0.9.9)
     yard-classmethods (1.0.0)
       yard
 
@@ -571,7 +583,7 @@ DEPENDENCIES
   knife-windows
   mixlib-install
   netrc
-  nokogiri
+  nokogiri (~> 1.7.2)
   oc-chef-pedant!
   octokit
   poise
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 7d990d9fe7..1be788ac43 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,5 +1,43 @@
 _This file holds "in progress" release notes for the current release under development and is intended for consumption by the Chef Documentation team. Please see <https://docs.chef.io/release_notes.html> for the official Chef release notes._
 
+# Chef Client Release Notes 12.21:
+
+## Security Fixes
+
+This release of Chef Client contains a new version of zlib, fixing 4
+CVEs:
+
+ *  [CVE-2016-9840](https://www.cvedetails.com/cve/CVE-2016-9840/)
+ *  [CVE-2016-9841](https://www.cvedetails.com/cve/CVE-2016-9841/)
+ *  [CVE-2016-9842](https://www.cvedetails.com/cve/CVE-2016-9842/)
+ *  [CVE-2016-9843](https://www.cvedetails.com/cve/CVE-2016-9843/)
+
+## On Debian based systems, correctly prefer Systemd to Upstart
+
+On Debian systems, packages that support systemd will often ship both an
+old style init script and a systemd unit file. When this happened, Chef
+would incorrectly choose Upstart rather than Systemd as the service
+provider. We now pick Systemd.
+
+## Handle the supports pseudo-property more gracefully
+
+Chef 13 removed the `supports` property from core resources. However,
+many cookbooks also have a property named support, and Chef 12 was
+incorrectly giving a deprecation notice in that case, preventing users
+from properly testing their cookbooks for upgrades.
+
+## Don't crash when we downgrade from Chef 13 to Chef 12
+
+On systems where Chef 13 had been run, Chef 12 would crash as the
+on disk cookbook format has changed. Chef 12 now correctly ignores the
+unexpected files.
+
+## Provide better system information when Chef crashes
+
+When Chef crashes, the output now includes details about the platform
+and version of Chef that was running, so that a bug report has more
+detail from the off.
+
 # Chef Client Release Notes 12.19:
 
 ## Highlighted enhancements for this release:
diff --git a/VERSION b/VERSION
index 73b34f6ab7..e68b860383 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.20.3
\ No newline at end of file
+12.21.0
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 2f7ebe7e34..9d6c17b968 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.20.3"
+  VERSION = "12.21.0"
 end
 
 #
diff --git a/chef.gemspec b/chef.gemspec
index 2b80d817b8..502230fe45 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   s.add_dependency "erubis", "~> 2.7"
   s.add_dependency "diff-lcs", "~> 1.2", ">= 1.2.4"
 
-  s.add_dependency "chef-zero", ">= 4.8"
+  s.add_dependency "chef-zero", ">= 4.8", "< 13"
 
   s.add_dependency "plist", "~> 3.2"
   s.add_dependency "iniparse", "~> 1.4"
diff --git a/lib/chef/property.rb b/lib/chef/property.rb
index d1be172ac2..776b64bdc8 100644
--- a/lib/chef/property.rb
+++ b/lib/chef/property.rb
@@ -659,7 +659,7 @@ class Chef
 
       # Special case for `supports` as it was moved in Chef 13 and this is causing
       # some user confusion in cookbooks that need to support both 12 and 13.
-      return if name.to_s == 'supports'
+      return if name.to_s == "supports"
 
       # Emit the deprecation.
       resource_name = declared_in.respond_to?(:resource_name) ? declared_in.resource_name : declared_in
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 9f34f0aa5d..6efc64b9e1 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.20.3"
+  VERSION = "12.21.0"
 end
 
 #
diff --git a/tasks/changelog.rb b/tasks/changelog.rb
index 8484acde24..3018e67608 100644
--- a/tasks/changelog.rb
+++ b/tasks/changelog.rb
@@ -4,7 +4,7 @@ begin
 
   namespace :changelog do
     # Fetch the latest version from mixlib-install
-    latest_stable_version = Mixlib::Install.available_versions("chef", "stable").last
+    latest_stable_version = Mixlib::Install.available_versions("chef", "stable").select { |n| n.start_with? "12" }.last
 
     # Take the changelog from the latest stable release and put it into history.
     task :archive do
@@ -17,13 +17,11 @@ begin
     # recent stable version and HEAD.
     GitHubChangelogGenerator::RakeTask.new :update do |config|
       config.future_release = "v#{Chef::VERSION}"
-      config.between_tags = ["v#{latest_stable_version}", "v#{Chef::VERSION}"]
+      config.since_tag = "v#{latest_stable_version}"
+      config.release_branch = "chef-12"
       config.max_issues = 0
       config.add_issues_wo_labels = false
-      config.enhancement_labels = "enhancement,Enhancement,New Feature,Feature".split(",")
-      config.bug_labels = "bug,Bug,Improvement,Upstream Bug".split(",")
-      config.exclude_labels = "duplicate,question,invalid,wontfix,no_changelog,Exclude From Changelog,Question,Discussion,Meta: Exclude From Changelog".split(",")
-      config.header = "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)."
+      config.header = "This changelog reflects the current state of chef's chef-12 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)."
     end
   end