Merge branch 'master' into version-check

Signed-off-by: Noah Kantrowitz <noah@coderanger.net>

9 files changed, 57 insertions, 33 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8393be69f5..d2092f9432 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).
 
-## [v13.1.28](https://github.com/chef/chef/tree/v13.1.28) (2017-05-25)
-[Full Changelog](https://github.com/chef/chef/compare/v12.20.3...v13.1.28)
+## [v13.1.31](https://github.com/chef/chef/tree/v13.1.31) (2017-05-26)
+[Full Changelog](https://github.com/chef/chef/compare/v13.0.118...v13.1.31)
 
 **Closed issues:**
 
@@ -10,6 +10,7 @@ This changelog reflects the current state of chef's master branch on github and
 
 **Merged pull requests:**
 
+- Use socketless local mode by default [\#6177](https://github.com/chef/chef/pull/6177) ([coderanger](https://github.com/coderanger))
 - convert breakpoint resource to a custom resource [\#6176](https://github.com/chef/chef/pull/6176) ([lamont-granquist](https://github.com/lamont-granquist))
 - Make non-legacy solo use socketless mode [\#6174](https://github.com/chef/chef/pull/6174) ([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))
@@ -20,6 +21,12 @@ This changelog reflects the current state of chef's master branch on github and
 - User on Windows with group incorrectly warns about passing GID [\#6125](https://github.com/chef/chef/pull/6125) ([harikesh-kolekar](https://github.com/harikesh-kolekar))
 - Update windows\_task to fix day validation with monthly frequency [\#6105](https://github.com/chef/chef/pull/6105) ([Stromweld](https://github.com/Stromweld))
 - cab\_package should compare package name and version [\#6100](https://github.com/chef/chef/pull/6100) ([smurawski](https://github.com/smurawski))
+- Fix manage\_home on AIX [\#6097](https://github.com/chef/chef/pull/6097) ([thommay](https://github.com/thommay))
+- apt-key finger no longer matches extract fingerprints regex [\#6094](https://github.com/chef/chef/pull/6094) ([whiteley](https://github.com/whiteley))
+- Fix lazy loading of cookbook files [\#6087](https://github.com/chef/chef/pull/6087) ([thommay](https://github.com/thommay))
+- add a pointer from the run\_context back to the runner [\#6077](https://github.com/chef/chef/pull/6077) ([lamont-granquist](https://github.com/lamont-granquist))
+- Knife key commands were missing a library they used [\#6071](https://github.com/chef/chef/pull/6071) ([coderanger](https://github.com/coderanger))
+- Add usage banner for knife client key create [\#6064](https://github.com/chef/chef/pull/6064) ([danielsdeleo](https://github.com/danielsdeleo))
 
 ## [v12.19.33](https://github.com/chef/chef/tree/v12.19.33) (2017-02-16)
 [Full Changelog](https://github.com/chef/chef/compare/v12.18.31...v12.19.33)
diff --git a/Gemfile.lock b/Gemfile.lock
index 7c21b36187..7674e6e64a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -30,10 +30,10 @@ GIT
 PATH
   remote: .
   specs:
-    chef (13.1.29)
+    chef (13.1.32)
       addressable
       bundler (>= 1.10)
-      chef-config (= 13.1.29)
+      chef-config (= 13.1.32)
       chef-zero (>= 13.0)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -60,10 +60,10 @@ PATH
       specinfra (~> 2.10)
       syslog-logger (~> 1.6)
       uuidtools (~> 2.1.5)
-    chef (13.1.29-universal-mingw32)
+    chef (13.1.32-universal-mingw32)
       addressable
       bundler (>= 1.10)
-      chef-config (= 13.1.29)
+      chef-config (= 13.1.32)
       chef-zero (>= 13.0)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -105,7 +105,7 @@ PATH
 PATH
   remote: chef-config
   specs:
-    chef-config (13.1.29)
+    chef-config (13.1.32)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index b8a134d9f3..9cf4783024 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -2,7 +2,7 @@ _This file holds "in progress" release notes for the current release under devel
 
 # Chef Client Release Notes
 
-# 13.2
+# 13.1
 
 ## Socketless local mode by default
 
@@ -13,9 +13,13 @@ connects to the internal Zero server for the converge and changes data.
 If you use Chef Provisioning with Local Mode, you may need to pass `--listen` to
 `chef-client`.
 
-# 13.1
+## New Deprecations
+
+### Removal of support for Ohai version 6 plugins (OHAI-10)
+
+<https://docs.chef.io/deprecations_ohai_v6_plugins.html>
 
-No new major features.
+In Chef/Ohai 14 (April 2018) we will remove support for loading Ohai v6 plugins, which we deprecated in Ohai 7/Chef 11.12.
 
 # 13.0
 
@@ -406,10 +410,3 @@ Chef Client will only exit with exit codes defined in RFC 062.  This allows othe
 
 When Chef Client is running as a forked process on unix systems, the standardized exit codes are used by the child process.  To actually have Chef Client return the standard exit code, `client_fork false` will need to be set in Chef Client's configuration file.
 
-## New Deprecations
-
-### Removal of support for Ohai version 6 plugins (OHAI-10)
-
-<https://docs.chef.io/deprecations_ohai_v6_plugins.html>
-
-In Chef/Ohai 14 (April 2018) we will remove support for loading Ohai v6 plugins, which we deprecated in Ohai 7/Chef 11.12.
diff --git a/VERSION b/VERSION
index 6f132a9241..35b4aa0382 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.1.29
\ No newline at end of file
+13.1.32
\ No newline at end of file
diff --git a/acceptance/basics/test/integration/chef-current-install/serverspec/chef_client_spec.rb b/acceptance/basics/test/integration/chef-current-install/serverspec/chef_client_spec.rb
index 7bdb4e4ed3..6c5a1d7f58 100644
--- a/acceptance/basics/test/integration/chef-current-install/serverspec/chef_client_spec.rb
+++ b/acceptance/basics/test/integration/chef-current-install/serverspec/chef_client_spec.rb
@@ -2,7 +2,7 @@
 require "spec_helper"
 
 gem_path = "/opt/chef/embedded/bin/gem"
-white_list = %w{addressable chef-config json rake}
+white_list = %w{addressable chef-config json minitest rake}
 
 describe "gem list" do
   it "should not have non-whitelisted duplicate gems" do
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index c14bc6b4de..b44e35e8f1 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 = "13.1.29"
+  VERSION = "13.1.32"
 end
 
 #
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index db114e90d0..df3b87a9fd 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("13.1.29")
+  VERSION = Chef::VersionString.new("13.1.32")
 end
 
 #
diff --git a/spec/integration/knife/common_options_spec.rb b/spec/integration/knife/common_options_spec.rb
index c941dcc1ee..6b6b83aafe 100644
--- a/spec/integration/knife/common_options_spec.rb
+++ b/spec/integration/knife/common_options_spec.rb
@@ -22,6 +22,14 @@ describe "knife common options", :workstation do
   include IntegrationSupport
   include KnifeSupport
 
+  before do
+    # Allow this for testing the various port binding stuffs. Remove when
+    # we kill off --listen.
+    Chef::Config.treat_deprecation_warnings_as_errors(false)
+  end
+
+  let(:local_listen_warning) { /\Awarn:.*local.*listen.*$/i }
+
   when_the_repository "has a node" do
     before { file "nodes/x.json", {} }
 
@@ -30,15 +38,20 @@ describe "knife common options", :workstation do
         Chef::Config.chef_zero.enabled = true
       end
 
-      it "knife raw /nodes/x should retrieve the node" do
+      it "knife raw /nodes/x should retrieve the node in socketless mode" do
+        Chef::Config.treat_deprecation_warnings_as_errors(true)
         knife("raw /nodes/x").should_succeed( /"name": "x"/ )
       end
 
+      it "knife raw /nodes/x should retrieve the node" do
+        knife("raw --listen /nodes/x").should_succeed( /"name": "x"/, stderr: local_listen_warning )
+      end
+
       context "And chef_zero.port is 9999" do
         before(:each) { Chef::Config.chef_zero.port = 9999 }
 
         it "knife raw /nodes/x should retrieve the node" do
-          knife("raw /nodes/x").should_succeed( /"name": "x"/ )
+          knife("raw --listen /nodes/x").should_succeed( /"name": "x"/, stderr: local_listen_warning )
           expect(Chef::Config.chef_server_url).to eq("chefzero://localhost:9999")
         end
       end
@@ -48,7 +61,7 @@ describe "knife common options", :workstation do
         before(:each) { Chef::Config.chef_zero.host = "0.0.0.0" }
 
         it "knife raw /nodes/x should retrieve the role" do
-          knife("raw /nodes/x").should_succeed( /"name": "x"/ )
+          knife("raw --listen /nodes/x").should_succeed( /"name": "x"/, stderr: local_listen_warning )
         end
       end
 
@@ -86,21 +99,26 @@ EOM
         end
 
         it "knife raw /nodes/x should retrieve the node" do
-          knife("raw /nodes/x").should_succeed( /"name": "x"/ )
+          knife("raw --listen /nodes/x").should_succeed( /"name": "x"/, stderr: local_listen_warning )
         end
       end
     end
 
-    it "knife raw -z /nodes/x retrieves the node" do
+    it "knife raw -z /nodes/x retrieves the node in socketless mode" do
+      Chef::Config.treat_deprecation_warnings_as_errors(true)
       knife("raw -z /nodes/x").should_succeed( /"name": "x"/ )
     end
 
+    it "knife raw -z /nodes/x retrieves the node" do
+      knife("raw -z --listen /nodes/x").should_succeed( /"name": "x"/, stderr: local_listen_warning )
+    end
+
     it "knife raw --local-mode /nodes/x retrieves the node" do
-      knife("raw --local-mode /nodes/x").should_succeed( /"name": "x"/ )
+      knife("raw --local-mode --listen /nodes/x").should_succeed( /"name": "x"/, stderr: local_listen_warning )
     end
 
     it "knife raw -z --chef-zero-port=9999 /nodes/x retrieves the node" do
-      knife("raw -z --chef-zero-port=9999 /nodes/x").should_succeed( /"name": "x"/ )
+      knife("raw -z --chef-zero-port=9999 --listen /nodes/x").should_succeed( /"name": "x"/, stderr: local_listen_warning )
       expect(Chef::Config.chef_server_url).to eq("chefzero://localhost:9999")
     end
 
@@ -118,7 +136,7 @@ EOM
       end
 
       it "knife raw -z /nodes/x retrieves the node" do
-        knife("raw -z /nodes/x").should_succeed( /"name": "x"/ )
+        knife("raw -z --listen /nodes/x").should_succeed( /"name": "x"/, stderr: local_listen_warning )
         expect(URI(Chef::Config.chef_server_url).port).to be > 8889
       end
     end
@@ -137,18 +155,18 @@ EOM
       end
 
       it "knife raw -z --chef-zero-port=9999-20000 /nodes/x" do
-        knife("raw -z --chef-zero-port=9999-20000 /nodes/x").should_succeed( /"name": "x"/ )
+        knife("raw -z --chef-zero-port=9999-20000 --listen /nodes/x").should_succeed( /"name": "x"/, stderr: local_listen_warning )
         expect(URI(Chef::Config.chef_server_url).port).to be > 9999
       end
 
       it "knife raw -z --chef-zero-port=9999-9999,19423" do
-        knife("raw -z --chef-zero-port=9999-9999,19423 /nodes/x").should_succeed( /"name": "x"/ )
+        knife("raw -z --chef-zero-port=9999-9999,19423 --listen /nodes/x").should_succeed( /"name": "x"/, stderr: local_listen_warning )
         expect(URI(Chef::Config.chef_server_url).port).to be == 19423
       end
     end
 
     it "knife raw -z --chef-zero-port=9999 /nodes/x retrieves the node" do
-      knife("raw -z --chef-zero-port=9999 /nodes/x").should_succeed( /"name": "x"/ )
+      knife("raw -z --chef-zero-port=9999 --listen /nodes/x").should_succeed( /"name": "x"/, stderr: local_listen_warning )
       expect(Chef::Config.chef_server_url).to eq("chefzero://localhost:9999")
     end
   end
diff --git a/tasks/changelog.rb b/tasks/changelog.rb
index 1f969637c3..74ac704abf 100644
--- a/tasks/changelog.rb
+++ b/tasks/changelog.rb
@@ -5,7 +5,9 @@ begin
   namespace :changelog do
     # Fetch the latest version from mixlib-install
     def latest_stable_version
-      Mixlib::Install.available_versions("chef", "stable").last
+      # for 13.1, a 12.20 release was made after 13.0, which is busting the changelog generator. Reset this post 13.1 release
+      "13.0.118"
+      # Mixlib::Install.available_versions("chef", "stable").last
     end
 
     # Take the changelog from the latest stable release and put it into history.