summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAsk Solem <ask@celeryproject.org>2013-08-16 17:24:12 +0100
committerAsk Solem <ask@celeryproject.org>2013-08-16 17:24:12 +0100
commit097e0bfe5b8f9b64e38c6496160bf346411e0ff3 (patch)
treed58ecc88596b40c34abf6d654fa8931dc14be639
parent81061a868dec5bc914ced0c7cd5d3a7b5690f7da (diff)
downloadpy-amqp-097e0bfe5b8f9b64e38c6496160bf346411e0ff3.tar.gz
Bumps version to 1.2.1v1.2.1
-rw-r--r--Changelog10
-rw-r--r--README.rst2
-rw-r--r--amqp/__init__.py2
3 files changed, 12 insertions, 2 deletions
diff --git a/Changelog b/Changelog
index 431c0bc..e2faa86 100644
--- a/Changelog
+++ b/Changelog
@@ -5,6 +5,16 @@ py-amqp is fork of amqplib used by Kombu containing additional features and impr
The previous amqplib changelog is here:
http://code.google.com/p/py-amqplib/source/browse/CHANGES
+.. _version-1.2.1:
+
+1.2.1
+=====
+:release-date: 2013-08-16 05:30 P.M UTC
+
+- Adds promise type: :meth:`amqp.utils.promise`
+
+- Merges fixes from 1.0.x
+
.. _version-1.2.0:
1.2.0
diff --git a/README.rst b/README.rst
index c39f53f..a885b74 100644
--- a/README.rst
+++ b/README.rst
@@ -2,7 +2,7 @@
Python AMQP 0.9.1 client library
=====================================================================
-:Version: 1.2.0
+:Version: 1.2.1
:Web: http://amqp.readthedocs.org/
:Download: http://pypi.python.org/pypi/amqp/
:Source: http://github.com/celery/py-amqp/
diff --git a/amqp/__init__.py b/amqp/__init__.py
index 919d993..00bd9e2 100644
--- a/amqp/__init__.py
+++ b/amqp/__init__.py
@@ -16,7 +16,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
from __future__ import absolute_import
-VERSION = (1, 2, 0)
+VERSION = (1, 2, 1)
__version__ = '.'.join(map(str, VERSION[0:3])) + ''.join(VERSION[3:])
__author__ = 'Barry Pederson'
__maintainer__ = 'Ask Solem'