Bump minor version to 12.17 after 12.16 release

Signed-off-by: Tom Duffield <tom@chef.io>

5 files changed, 41 insertions, 19 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index b0cfd096cf..f6815b9993 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/chef/chef-server
-  revision: f4a124354730cbd61c14635dca955d385cfa382d
+  revision: be1f43367a3a75e7a1b771a11fb5e48b6f6cf310
   specs:
     oc-chef-pedant (2.2.0)
       activesupport (>= 4.2.7.1, < 6.0)
@@ -24,7 +24,7 @@ GIT
 
 GIT
   remote: https://github.com/rubysec/bundler-audit.git
-  revision: b7123d7b294f244165d9469f22b37a559e235fc2
+  revision: 044d056961dbc4b70d236a354a9cc86af54e0ae2
   specs:
     bundler-audit (0.5.0)
       bundler (~> 1.2)
@@ -33,10 +33,10 @@ GIT
 PATH
   remote: .
   specs:
-    chef (12.16.55)
+    chef (12.17.0)
       addressable
       bundler (>= 1.10)
-      chef-config (= 12.16.55)
+      chef-config (= 12.17.0)
       chef-zero (>= 4.8)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -62,10 +62,10 @@ PATH
       specinfra (~> 2.10)
       syslog-logger (~> 1.6)
       uuidtools (~> 2.1.5)
-    chef (12.16.55-universal-mingw32)
+    chef (12.17.0-universal-mingw32)
       addressable
       bundler (>= 1.10)
-      chef-config (= 12.16.55)
+      chef-config (= 12.17.0)
       chef-zero (>= 4.8)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -106,7 +106,7 @@ PATH
 PATH
   remote: chef-config
   specs:
-    chef-config (12.16.55)
+    chef-config (12.17.0)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
@@ -125,12 +125,12 @@ GEM
       mixlib-cli (~> 1.4)
     artifactory (2.5.0)
     ast (2.3.0)
-    aws-sdk (2.6.14)
-      aws-sdk-resources (= 2.6.14)
-    aws-sdk-core (2.6.14)
+    aws-sdk (2.6.18)
+      aws-sdk-resources (= 2.6.18)
+    aws-sdk-core (2.6.18)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.6.14)
-      aws-sdk-core (= 2.6.14)
+    aws-sdk-resources (2.6.18)
+      aws-sdk-core (= 2.6.18)
     aws-sdk-v1 (1.66.0)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
@@ -172,7 +172,7 @@ GEM
       rspec (~> 3.0)
     codeclimate-test-reporter (0.6.0)
       simplecov (>= 0.7.1, < 1.0.0)
-    codecov (0.1.6)
+    codecov (0.1.7)
       json
       simplecov
       url
@@ -298,7 +298,7 @@ GEM
       mixlib-log
     mixlib-cli (1.7.0)
     mixlib-config (2.2.4)
-    mixlib-install (2.1.5)
+    mixlib-install (2.1.6)
       artifactory
       mixlib-shellout
       mixlib-versioning
@@ -465,7 +465,7 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
-    specinfra (2.64.0)
+    specinfra (2.66.0)
       net-scp
       net-ssh (>= 2.7, < 4.0)
       net-telnet
@@ -549,7 +549,7 @@ GEM
       rubyzip (~> 1.1)
       winrm (~> 2.0)
     wmi-lite (1.0.0)
-    yajl-ruby (1.2.1)
+    yajl-ruby (1.3.0)
     yard (0.9.5)
     yard-classmethods (1.0.0)
       yard
diff --git a/HISTORY.md b/HISTORY.md
index 487a28d105..5c1a933256 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,25 @@
+## [v12.16.42](https://github.com/chef/chef/tree/v12.16.42) (2016-11-04)
+[Full Changelog](https://github.com/chef/chef/compare/v12.15.19...v12.16.42)
+
+**Implemented enhancements:**
+
+- Core: improve readability of property-resource namespace collision exception message [\#5500](https://github.com/chef/chef/pull/5500) ([lamont-granquist](https://github.com/lamont-granquist))
+- Omnibus: Pull in Ohai 8.21.0 and other new deps [\#5499](https://github.com/chef/chef/pull/5499) ([tas50](https://github.com/tas50))
+- Core: Add deprecations to Data Collector run completion messages [\#5496](https://github.com/chef/chef/pull/5496) ([adamleff](https://github.com/adamleff))
+- Core: add attribute\_changed hook to event handlers [\#5495](https://github.com/chef/chef/pull/5495) ([lamont-granquist](https://github.com/lamont-granquist))
+- Knife: Add the `--field-separator` flag to knife show commands [\#5489](https://github.com/chef/chef/pull/5489) ([tduffield](https://github.com/tduffield))
+- Core: Enable Signed Header Auth for Data Collector, and Configure the Data Collector Automatically [\#5487](https://github.com/chef/chef/pull/5487) ([danielsdeleo](https://github.com/danielsdeleo))
+- Core: set use\_inline\_resources in package superclass [\#5483](https://github.com/chef/chef/pull/5483) ([lamont-granquist](https://github.com/lamont-granquist))
+
+**Fixed bugs:**
+
+- Enable data collector w/o token for solo, but require explicit URL [\#5511](https://github.com/chef/chef/pull/5511) ([danielsdeleo](https://github.com/danielsdeleo))
+- Core: Include chef/chef\_class in Chef::REST for method log\_deprecation [\#5504](https://github.com/chef/chef/pull/5504) ([smalltown](https://github.com/smalltown))
+- Knife: Updating knife ssl fetch to correctly store certificate when it does not have a CN [\#5498](https://github.com/chef/chef/pull/5498) ([tyler-ball](https://github.com/tyler-ball))
+- Knife: Fixed knife download cookbooks issue which used to corrupt the certificate files each time the command was fired. [\#5494](https://github.com/chef/chef/pull/5494) ([Aliasgar16](https://github.com/Aliasgar16))
+- Solaris: Properly check lock status of users on solaris2 [\#5486](https://github.com/chef/chef/pull/5486) ([tduffield](https://github.com/tduffield))
+- Solaris: Fix IPS package must create symlinks to package commands [\#5485](https://github.com/chef/chef/pull/5485) ([jaymalasinha](https://github.com/jaymalasinha))
+
 ## [v12.15.19](https://github.com/chef/chef/tree/v12.15.19) (2016-10-07)
 [Full Changelog](https://github.com/chef/chef/compare/v12.14.89...v12.15.19)
 
diff --git a/VERSION b/VERSION
index aa7e750622..dfd39f4bf7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.16.55
\ No newline at end of file
+12.17.0
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 0e71cfc49a..a197885eb5 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.16.55"
+  VERSION = "12.17.0"
 end
 
 #
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 188300cb65..4b1a6c6926 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.16.55"
+  VERSION = "12.17.0"
 end
 
 #