authors/changelog for 2.15.1

Change-Id: Id5f5467a50119d521fead28faf751c621ce1e4ee

3 files changed, 42 insertions, 0 deletions

diff --git a/AUTHORS b/AUTHORS
index 06b5985e8..d41e7641b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -30,10 +30,12 @@ Contributors
 ------------
 Aaron Rosen (arosen@nicira.com)
 Adrian Smith (adrian_f_smith@dell.com)
+Akihiro Motoki (amotoki@gmail.com)
 Akihito Takai (takaiak@nttdata.co.jp)
 Alex Gaynor (alex.gaynor@gmail.com)
 Alex Holden (alex@alexjonasholden.com)
 Alex Pecoraro (alex.pecoraro@emc.com)
+Alex Szarka (szarka@inf.u-szeged.hu)
 Alex Yang (alex890714@gmail.com)
 Alexandra Settle (alexandra.settle@rackspace.com)
 Alexandre Lécuyer (alexandre.lecuyer@corp.ovh.com)
@@ -287,6 +289,7 @@ Pádraig Brady (pbrady@redhat.com)
 Qiaowei Ren (qiaowei.ren@intel.com)
 Rafael Rivero (rafael@cloudscaling.com)
 Rainer Toebbicke (Rainer.Toebbicke@cern.ch)
+rajat29 (rajat.sharma@nectechnologies.in)
 Ray Chen (oldsharp@163.com)
 Rebecca Finn (rebeccax.finn@intel.com)
 Ricardo Ferreira (ricardo.sff@gmail.com)
@@ -304,6 +307,7 @@ Scott Simpson (sasimpson@gmail.com)
 Sergey Kraynev (skraynev@mirantis.com)
 Sergey Lukjanov (slukjanov@mirantis.com)
 Shane Wang (shane.wang@intel.com)
+shangxiaobj (shangxiaobj@inspur.com)
 shaofeng_cheng (chengsf@winhong.com)
 Shashank Kumar Shankar (shashank.kumar.shankar@intel.com)
 Shashirekha Gundur (shashirekha.j.gundur@intel.com)
@@ -362,6 +366,7 @@ Zack M. Davis (zdavis@swiftstack.com)
 Zap Chang (zapchang@gmail.com)
 Zhang Guoqing (zhang.guoqing@99cloud.net)
 Zhang Jinnan (ben.os@99cloud.net)
+zhangdebo1987 (zhangdebo@inspur.com)
 zhangyanxian (zhangyanxianmail@163.com)
 Zhao Lei (zhaolei@cn.fujitsu.com)
 Zheng Yao (zheng.yao1@zte.com.cn)
diff --git a/CHANGELOG b/CHANGELOG
index 0d9f76cbe..a305b67b4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,21 @@
+swift (2.15.1)
+    * Fixed a bug introduced in 2.15.0 where the object reconstructor
+      would exit with a traceback if no EC policy was configured.
+
+    * Fixed deadlock when logging from a tpool thread.
+
+      The object server runs certain IO-intensive methods outside the
+      main pthread for performance. Previously, if one of those methods
+      tried to log, this can cause a crash that eventually leads to an
+      object server with hundreds or thousands of greenthreads, all
+      deadlocked. The fix is to use a mutex that works across different
+      greenlets and different pthreads.
+
+    * The object reconstructor can now rebuild an EC fragment for an
+      expired object.
+
+    * Various other minor bug fixes and improvements.
+
 swift (2.15.0)
 
     * Add Composite Ring Functionality
diff --git a/releasenotes/notes/2_15_1_release-be25e67bfc5e886a.yaml b/releasenotes/notes/2_15_1_release-be25e67bfc5e886a.yaml
new file mode 100644
index 000000000..5c8ae8787
--- /dev/null
+++ b/releasenotes/notes/2_15_1_release-be25e67bfc5e886a.yaml
@@ -0,0 +1,19 @@
+---
+fixes:
+  - |
+    Fixed a bug introduced in 2.15.0 where the object reconstructor
+    would exit with a traceback if no EC policy was configured.
+  - |
+    Fixed deadlock when logging from a tpool thread.
+
+    The object server runs certain IO-intensive methods outside the
+    main pthread for performance. Previously, if one of those methods
+    tried to log, this can cause a crash that eventually leads to an
+    object server with hundreds or thousands of greenthreads, all
+    deadlocked. The fix is to use a mutex that works across different
+    greenlets and different pthreads.
+  - |
+    The object reconstructor can now rebuild an EC fragment for an
+    expired object.
+other:
+  - Various other minor bug fixes and improvements.