Bump version of chef to 12.18.48 by Chef Versioner.v12.18.48

5 files changed, 10 insertions, 11 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9010ee9753..93f3013682 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).
 
-## [v12.18.47](https://github.com/chef/chef/tree/v12.18.47) (2017-01-23)
-[Full Changelog](https://github.com/chef/chef/compare/v12.17.44...v12.18.47)
+## [v12.18.48](https://github.com/chef/chef/tree/v12.18.48) (2017-01-24)
+[Full Changelog](https://github.com/chef/chef/compare/v12.17.44...v12.18.48)
 
 **Implemented enhancements:**
 
@@ -19,7 +19,6 @@ This changelog reflects the current state of chef's master branch on github and
 - \[cheffs\] Don't iterate parent object on exist? call [\#5648](https://github.com/chef/chef/pull/5648) ([stevendanna](https://github.com/stevendanna))
 - Core: Remove Chef::Platform::HandlerMap [\#5636](https://github.com/chef/chef/pull/5636) ([lamont-granquist](https://github.com/lamont-granquist))
 - Core: Properly deprecate old Chef::Platform methods [\#5631](https://github.com/chef/chef/pull/5631) ([lamont-granquist](https://github.com/lamont-granquist))
-- Deprecate creating properties whose names are already methods [\#5606](https://github.com/chef/chef/pull/5606) ([adamleff](https://github.com/adamleff))
 
 **Fixed bugs:**
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 539391b709..56df498470 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -47,10 +47,10 @@ GIT
 PATH
   remote: .
   specs:
-    chef (12.18.47)
+    chef (12.18.48)
       addressable
       bundler (>= 1.10)
-      chef-config (= 12.18.47)
+      chef-config (= 12.18.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.18.47-universal-mingw32)
+    chef (12.18.48-universal-mingw32)
       addressable
       bundler (>= 1.10)
-      chef-config (= 12.18.47)
+      chef-config (= 12.18.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.18.47)
+    chef-config (12.18.48)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 573755f47c..dc77386ad7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.18.47
\ No newline at end of file
+12.18.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 7782acdd18..d1f8ca2b3f 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.18.47"
+  VERSION = "12.18.48"
 end
 
 #
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 0aaec195f8..8d2f397214 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.18.47"
+  VERSION = "12.18.48"
 end
 
 #