Bump version to 4.6.1

chef · Apr 14, 2016 · c023fff · c023fff
1 parent a889d56
commit c023fff
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,15 @@
 # Change Log
 
-## [4.6.0](https://github.com/chef/chef-zero/tree/4.6.0) (2016-04-14)
-[Full Changelog](https://github.com/chef/chef-zero/compare/v4.5.0...4.6.0)
+## [4.6.1](https://github.com/chef/chef-zero/tree/4.6.1) (2016-04-14)
+[Full Changelog](https://github.com/chef/chef-zero/compare/v4.6.0...4.6.1)
+
+**Fixed bugs:**
+
+- Actually merge key data in user PUT response [\#214](https://github.com/chef/chef-zero/pull/214) ([jkeiser](https://github.com/jkeiser))
+- Fix users endpoint in OSC compat mode to use a data store URL [\#213](https://github.com/chef/chef-zero/pull/213) ([jkeiser](https://github.com/jkeiser))
+
+## [v4.6.0](https://github.com/chef/chef-zero/tree/v4.6.0) (2016-04-14)
+[Full Changelog](https://github.com/chef/chef-zero/compare/v4.5.0...v4.6.0)
 
 **Implemented enhancements:**
 

diff --git a/lib/chef_zero/version.rb b/lib/chef_zero/version.rb
@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = '4.6.0'
+  VERSION = '4.6.1'
 end