Bump version of chef to 12.17.48 by Chef Versioner.v12.17.48

5 files changed, 11 insertions, 10 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fbe63db43c..6d9fa45993 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,11 @@
 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.47](https://github.com/chef/chef/tree/v12.17.47) (2016-12-07)
-[Full Changelog](https://github.com/chef/chef/compare/v12.16.42...v12.17.47)
+## [v12.17.48](https://github.com/chef/chef/tree/v12.17.48) (2016-12-08)
+[Full Changelog](https://github.com/chef/chef/compare/v12.16.42...v12.17.48)
 
 **Implemented enhancements:**
 
+- Yaml support for chef config objects [\#5620](https://github.com/chef/chef/issues/5620)
 - Action :umount for mount resource is an obtuse anachronism [\#5595](https://github.com/chef/chef/issues/5595)
 - Core: Update ohai resource to new style, stop overwriting name property [\#5607](https://github.com/chef/chef/pull/5607) ([adamleff](https://github.com/adamleff))
 - Linux: mount provider - skip device detection for zfs [\#5603](https://github.com/chef/chef/pull/5603) ([ttr](https://github.com/ttr))
diff --git a/Gemfile.lock b/Gemfile.lock
index e10887221d..1cac88ef1d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -47,10 +47,10 @@ GIT
 PATH
   remote: .
   specs:
-    chef (12.17.47)
+    chef (12.17.48)
       addressable
       bundler (>= 1.10)
-      chef-config (= 12.17.47)
+      chef-config (= 12.17.48)
       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.47-universal-mingw32)
+    chef (12.17.48-universal-mingw32)
       addressable
       bundler (>= 1.10)
-      chef-config (= 12.17.47)
+      chef-config (= 12.17.48)
       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.47)
+    chef-config (12.17.48)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 0d8c5a59c6..ec38d61766 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.17.47
\ No newline at end of file
+12.17.48
\ 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 b59a2928ac..82f30424ac 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.47"
+  VERSION = "12.17.48"
 end
 
 #
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 9f7de1e57a..4bb695b8f7 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.47"
+  VERSION = "12.17.48"
 end
 
 #