Merge pull request #7454 from chef/13_10_v2

Bump to 13.10 and add release notes

7 files changed, 35 insertions, 27 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index b06861c60c..273c6a3349 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
 PATH
   remote: .
   specs:
-    chef (13.9.8)
+    chef (13.10.0)
       addressable
       bundler (>= 1.10)
-      chef-config (= 13.9.8)
+      chef-config (= 13.10.0)
       chef-zero (~> 13.0)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -39,10 +39,10 @@ PATH
       specinfra (~> 2.10)
       syslog-logger (~> 1.6)
       uuidtools (~> 2.1.5)
-    chef (13.9.8-universal-mingw32)
+    chef (13.10.0-universal-mingw32)
       addressable
       bundler (>= 1.10)
-      chef-config (= 13.9.8)
+      chef-config (= 13.10.0)
       chef-zero (~> 13.0)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -84,7 +84,7 @@ PATH
 PATH
   remote: chef-config
   specs:
-    chef-config (13.9.8)
+    chef-config (13.10.0)
       addressable
       fuzzyurl
       mixlib-config (>= 2.2.12, < 3.0)
@@ -231,7 +231,7 @@ GEM
       systemu (~> 2.6.4)
       wmi-lite (~> 1.0)
     parallel (1.12.1)
-    parser (2.5.1.0)
+    parser (2.5.1.2)
       ast (~> 2.4.0)
     parslet (1.8.2)
     plist (3.4.0)
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 2f9253d729..4222d6fc2c 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,5 +1,24 @@
 _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 13.10
+
+## Bugfixes
+
+- Resolves a duplicate logging getting created when redirecting stdout
+- Using --recipe-url with a local file on Windows no longer fails
+- Service resource no longer throws Ruby deprecation warnings on Windows
+
+## Ohai 13.10 Improvements
+
+- Correctly identify the platform_version on the final release of Amazon Linux 2.0
+- Detect nodes with the DMI data of "OpenStack Compute" as being OpenStack nodes
+
+## Security Updates
+
+### ffi Gem
+
+- CVE-2018-1000201: DLL loading issue which can be hijacked on Windows OS
+
 # Chef Client Release Notes 13.9.X:
 
 ## Security Updates
diff --git a/ROADMAP.md b/ROADMAP.md
deleted file mode 100644
index eeec513a3f..0000000000
--- a/ROADMAP.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Roadmap
-
-This file provides direction for the project as set forth by [RFC030#Roadmap](https://github.com/chef/chef-rfc/blob/master/rfc030-maintenance-policy.md#roadmap). 
-
-It is drafted by the Project Lead and the Lieutenants, with input from Maintainers and Contributors.
-
-## 2016 Q1
-* Windows - core windows_feature
-  - Move windows_feature from Windows cookbook, add caching
-* Windows - knife windows bootstrap, knife windows winrm in core
-  - Migrate Windows bootstrapping functionality into core
diff --git a/VERSION b/VERSION
index 4a8b7ef408..c554e7e865 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.9.8
\ No newline at end of file
+13.10.0
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 2b8762e4ff..6b3d1a1325 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.9.8"
+  VERSION = "13.10.0"
 end
 
 #
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index c30eb237a5..bfab205992 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.9.8")
+  VERSION = Chef::VersionString.new("13.10.0")
 end
 
 #
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 2ca2c29e80..2c772500d3 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -29,13 +29,13 @@ GEM
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     awesome_print (1.8.0)
-    aws-sdk (2.11.83)
-      aws-sdk-resources (= 2.11.83)
-    aws-sdk-core (2.11.83)
+    aws-sdk (2.11.86)
+      aws-sdk-resources (= 2.11.86)
+    aws-sdk-core (2.11.86)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.11.83)
-      aws-sdk-core (= 2.11.83)
+    aws-sdk-resources (2.11.86)
+      aws-sdk-core (= 2.11.86)
     aws-sigv4 (1.0.3)
     berkshelf (4.3.5)
       addressable (~> 2.3, >= 2.3.4)
@@ -128,7 +128,7 @@ GEM
     mixlib-cli (1.7.0)
     mixlib-config (2.2.12)
       tomlrb
-    mixlib-install (3.10.0)
+    mixlib-install (3.11.2)
       mixlib-shellout
       mixlib-versioning
       thor
@@ -150,7 +150,7 @@ GEM
     nori (2.6.0)
     octokit (4.9.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ohai (14.2.0)
+    ohai (14.3.0)
       chef-config (>= 12.8, < 15)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)