From 344711771db6f3bbeaf85cbb1aa787b89d8d08e3 Mon Sep 17 00:00:00 2001
From: John Dickinson <me@not.mn>
Date: Tue, 26 Feb 2019 16:51:49 -0800
Subject: [PATCH] authors/changelog updates for release

Change-Id: Ic14916c314043155a5ec3c5b29331862c6aded43
---
 .mailmap                                           |  2 ++
 AUTHORS                                            |  9 ++++++++-
 ChangeLog                                          | 12 ++++++++++++
 releasenotes/notes/361_notes-59e020e68bcdd709.yaml | 12 ++++++++++++
 4 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/361_notes-59e020e68bcdd709.yaml

diff --git a/.mailmap b/.mailmap
index ecbcad1f..bc092300 100644
--- a/.mailmap
+++ b/.mailmap
@@ -95,3 +95,5 @@ Andreas Jaeger <aj@suse.de> <aj@suse.com>
 Shashi Kant <shashi.kant@nectechnologies.in>
 Nandini Tata <nandini.tata@intel.com> <nandini.tata.15@gmail.com>
 Flavio Percoco <flaper87@gmail.com>
+Timur Alperovich <timuralp@swiftstack.com> <timur@timuralp.com>
+Thiago da Silva <thiagodasilva@gmail.com> <thiago@redhat.com>
diff --git a/AUTHORS b/AUTHORS
index abc21e98..1fcf65d4 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -92,6 +92,7 @@ Monty Taylor (mordred@inaugust.com)
 Nandini Tata (nandini.tata@intel.com)
 Nelson Marcos (nelsonmarcos@gmail.com)
 Nguyen Hai (nguyentrihai93@gmail.com)
+Nguyen Hai Truong (truongnh@vn.fujitsu.com)
 Nguyen Hung Phuong (phuongnh@vn.fujitsu.com)
 Nick Craig-Wood (nick@craig-wood.com)
 Ondrej Novy (ondrej.novy@firma.seznam.cz)
@@ -103,6 +104,7 @@ Peter Lisak (peter.lisak@firma.seznam.cz)
 Petr Kovar (pkovar@redhat.com)
 Pradeep Kumar Singh (pradeep.singh@nectechnologies.in)
 Pratik Mallya (pratik.mallya@gmail.com)
+qingszhao (zhao.daqing@99cloud.net)
 Qiu Yu (qiuyu@ebaysf.com)
 Ray Chen (oldsharp@163.com)
 ricolin (rico.l@inwinstack.com)
@@ -124,11 +126,12 @@ Stanislaw Pitucha (stanislaw.pitucha@hpe.com)
 Steve Martinelli (stevemar@ca.ibm.com)
 Steven Hardy (shardy@redhat.com)
 Stuart McLaren (stuart.mclaren@hpe.com)
+sunjia (sunjia@inspur.com)
 Sushil Kumar (sushil.kumar2@globallogic.com)
 tanlin (lin.tan@intel.com)
 Taurus Cheung (Taurus.Cheung@harmonicinc.com)
 TheSriram (sriram@klusterkloud.com)
-Thiago da Silva (thiago@redhat.com)
+Thiago da Silva (thiagodasilva@gmail.com)
 Thomas Goirand (thomas@goirand.fr)
 Tihomir Trifonov (t.trifonov@gmail.com)
 Tim Burke (tim.burke@gmail.com)
@@ -141,9 +144,11 @@ Vasyl Khomenko (vasiliyk@yahoo-inc.com)
 venkatamahesh (venkatamaheshkotha@gmail.com)
 Victor Stinner (victor.stinner@enovance.com)
 Vitaly Gridnev (vgridnev@mirantis.com)
+Vu Cong Tuan (tuanvc@vn.fujitsu.com)
 wangqi (wang.qi@99cloud.net)
 wangxiyuan (wangxiyuan@huawei.com)
 Wu Wenxiang (wu.wenxiang@99cloud.net)
+wu.chunyang (wu.chunyang@99cloud.net)
 YangLei (yanglyy@cn.ibm.com)
 yangxurong (yangxurong@huawei.com)
 You Yamagata (bi.yamagata@gmail.com)
@@ -157,3 +162,5 @@ zhang-jinnan (ben.os@99cloud.net)
 zhangyanxian (zhangyanxianmail@163.com)
 zheng yin (yin.zheng@easystack.cn)
 Zhenguo Niu (zhenguo@unitedstack.com)
+ZhijunWei (wzj334965317@outlook.com)
+zhubx007 (zhu.boxiang@99cloud.net)
diff --git a/ChangeLog b/ChangeLog
index a37a6db0..26b46eaa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+3.6.1
+-----
+
+* Added the delimiter keyword parameter to `get_account()` to match the
+  functionality of `get_container()`.
+
+* Fixed an issue in the client module where socket connections weren't
+  closed properly before being dereferenced.
+
+* Various other minor bug fixes and improvements.
+
+
 3.6.0
 -----
 
diff --git a/releasenotes/notes/361_notes-59e020e68bcdd709.yaml b/releasenotes/notes/361_notes-59e020e68bcdd709.yaml
new file mode 100644
index 00000000..f6b48927
--- /dev/null
+++ b/releasenotes/notes/361_notes-59e020e68bcdd709.yaml
@@ -0,0 +1,12 @@
+---
+fixes:
+  - |
+    Added the delimiter keyword parameter to ``get_account()`` to match the
+    functionality of ``get_container()``.
+
+  - |
+    Fixed an issue in the client module where socket connections weren't
+    closed properly before being dereferenced.
+
+  - |
+    Various other minor bug fixes and improvements.