diff options
| author | John Keiser <john@johnkeiser.com> | 2016-04-14 16:30:50 -0700 |
|---|---|---|
| committer | John Keiser <john@johnkeiser.com> | 2016-04-14 16:30:50 -0700 |
| commit | c023fff4bc56012cf4a336ee3f705cde92cc3f56 (patch) | |
| tree | 6d960d67ffb75fbf408720a3184be308ee54ee3a | |
| parent | a889d563026df8ffb8b6fb8e48804f2171485997 (diff) | |
| download | chef-zero-c023fff4bc56012cf4a336ee3f705cde92cc3f56.tar.gz | |
Bump version to 4.6.1v4.6.1
| -rw-r--r-- | CHANGELOG.md | 12 | ||||
| -rw-r--r-- | lib/chef_zero/version.rb | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index cb4a3c9..ec809be 100644 --- 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 index 09841fd..0854858 100644 --- 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 |