Merge branch '12.15.3-release'

chef · May 3, 2017 · 3f95494 · 3f95494
2 parents e08e035 + 38d1186
commit 3f95494
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Chef Server Changelog
-## [12.15.2](https://github.com/chef/chef-server/tree/12.15.2) (2017-05-03)
-[Full Changelog](https://github.com/chef/chef-server/compare/12.15.0...12.15.2)
+## [12.15.3](https://github.com/chef/chef-server/tree/12.15.2) (2017-05-03)
+[Full Changelog](https://github.com/chef/chef-server/compare/12.15.0...12.15.3)
 
 **Fixed bugs:**
 

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -8,14 +8,17 @@ This document contains release notes for the current major release and all patch
 For prior releases, see
 [PRIOR\_RELEASE\_NOTES.md](PRIOR_RELEASE_NOTES.md).
 
-## 12.15.2 (2017-05-03)
+## 12.15.3 (2017-05-03)
 
 * Fixed regression [regression](https://github.com/chef/chef-server/pull/1246) in Bookshelf's preflight checks.
 * Fixed regression that would cause Manage to be misconfigured
   to enable LDAP by default.
 * PUT to `/users/USERNAME/_acl/PERM` will no longer return a 400 when the
   request is valid.
 
+Note: There was no released version 12.15.1 or 12.15.2 due
+      to issues identified internally.
+
 ## 12.15.0 (2017-04-27)
 
 ### Add required_recipe endpoint

diff --git a/omnibus/config/projects/chef-server.rb b/omnibus/config/projects/chef-server.rb
@@ -24,7 +24,7 @@
 replace         "private-chef"
 conflict        "private-chef"
 install_dir     "/opt/opscode"
-build_version   "12.15.2"
+build_version   "12.15.3"
 build_iteration 1
 #
 # Load dynamically updated overrides