Prepare the 0.21 release0.21

4 files changed, 31 insertions, 1 deletions

diff --git a/AUTHORS b/AUTHORS
index c5aafbf..9a11b3c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -28,11 +28,14 @@ Dmytro Litvinov <litvinov.do.it@gmail.com>
 Erik Weatherwax <erik.weatherwax@xls.xerox.com>
 fgouteroux <francois.gouteroux@d2-si.eu>
 Greg Allen <GregoryEAllen@users.noreply.github.com>
+Guillaume Delacour <gui@iroqwa.org>
 Guyzmo <guyzmo+github@m0g.net>
 hakkeroid <hakkeroid@users.noreply.github.com>
+Ian Sparks <isparks@mdsol.com>
 itxaka <itxakaserrano@gmail.com>
 Ivica Arsov <ivica.arsov@sculpteo.com>
 James (d0c_s4vage) Johnson <james.johnson@exodusintel.com>
+James E. Flemer <james.flemer@ndpgroup.com>
 James Johnson <d0c.s4vage@gmail.com>
 Jason Antman <jason@jasonantman.com>
 Johan Brandhorst <johan@cognitivelogic.com>
@@ -41,6 +44,7 @@ Koen Smets <koen.smets@gmail.com>
 Kris Gambirazzi <Kris@sitehost.co.nz>
 Mart Sõmermaa <mart.somermaa@cgi.com>
 massimone88 <stefano.mandruzzato@gmail.com>
+Matej Zerovnik <matej@zunaj.si>
 Matt Odden <locke105@gmail.com>
 Michal Galet <michal.galet@gmail.com>
 Mikhail Lopotkov <ms.lopotkov@tensor.ru>
@@ -59,4 +63,6 @@ savenger <github@smahmood.de>
 Stefan K. Dunkler <stefan.dun@gmail.com>
 Stefan Klug <klug.stefan@gmx.de>
 Stefano Mandruzzato <stefano.mandruzzato@gmail.com>
+Tim Neumann <mail@timnn.me>
 Will Starms <vilhelmen@gmail.com>
+Yosi Zelensky <yosyos04@gmail.com>
diff --git a/ChangeLog.rst b/ChangeLog.rst
index caaf439..6d313d6 100644
--- a/ChangeLog.rst
+++ b/ChangeLog.rst
@@ -1,6 +1,26 @@
 ChangeLog
 =========
 
+Version 0.21_ - 2017-05-24
+--------------------------
+
+* Add time_stats to ProjectMergeRequest
+* Update User options for creation and update (#246)
+* Add milestone.merge_requests() API
+* Fix docs typo (s/correspnding/corresponding/)
+* Support milestone start date (#251)
+* Add support for priority attribute in labels (#256)
+* Add support for nested groups (#257)
+* Make GroupProjectManager a subclass of ProjectManager (#255)
+* Available services: return a list instead of JSON (#258)
+* MR: add support for time tracking features (#248)
+* Fixed repository_tree and repository_blob path encoding (#265)
+* Add 'search' attribute to projects.list()
+* Initial gitlab API v4 support
+* Reorganise the code to handle v3 and v4 objects
+* Allow 202 as delete return code
+* Deprecate parameter related methods in gitlab.Gitlab
+
 Version 0.20_ - 2017-03-25
 ---------------------------
 
@@ -397,6 +417,7 @@ Version 0.1 - 2013-07-08
 
 * Initial release
 
+.. _0.21: https://github.com/python-gitlab/python-gitlab/compare/0.20...0.21
 .. _0.20: https://github.com/python-gitlab/python-gitlab/compare/0.19...0.20
 .. _0.19: https://github.com/python-gitlab/python-gitlab/compare/0.18...0.19
 .. _0.18: https://github.com/python-gitlab/python-gitlab/compare/0.17...0.18
diff --git a/RELEASE_NOTES.rst b/RELEASE_NOTES.rst
index 6e080c7..86cac9d 100644
--- a/RELEASE_NOTES.rst
+++ b/RELEASE_NOTES.rst
@@ -33,6 +33,9 @@ Changes from 0.20 to 0.21
   + ``set_credentials()`` is deprecated, use the ``email`` and ``password``
     arguments of the ``Gitlab`` constructor.
 
+* The service listing method (``ProjectServiceManager.list()``) now returns a
+  python list instead of a JSON string.
+
 Changes from 0.19 to 0.20
 =========================
 
diff --git a/gitlab/__init__.py b/gitlab/__init__.py
index 5b11c39..db96ab3 100644
--- a/gitlab/__init__.py
+++ b/gitlab/__init__.py
@@ -35,7 +35,7 @@ from gitlab.exceptions import *  # noqa
 from gitlab.v3.objects import *  # noqa
 
 __title__ = 'python-gitlab'
-__version__ = '0.20'
+__version__ = '0.21'
 __author__ = 'Gauvain Pocentek'
 __email__ = 'gauvain@pocentek.net'
 __license__ = 'LGPL3'