Bumping to 1.2.0

* Updated changelog.
eandersson · Jun 20, 2015 · 8a1a300 · 8a1a300
1 parent 5bd7b2a
commit 8a1a300
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,11 +1,19 @@
-##### Changelog
-###### Version 1.2.0
-- Added additional SSL parameters to UriConnection.
+# Changelog
+
+### Version 1.2.0
+
+#### Features
 - Allow incoming messages to be delivered as a Message class.
 - Introduced shortcuts to the Message class.
     - Message.Publish
     - Message.Ack / Message.Nack / Message.Reject
 - Added generator based consumer function called => build_inbound_messages.
 
-- Fixed PyPy specific bug.
+#### Improvements
+- TSLv1 is now set as default on SSL connections.
+- Added additional SSL parameters to UriConnection.
 - Re-factored Connection and IO handling.
+
+#### Bug Fixes
+- Fixed PyPy bug with handling of integers.
+- Python compiled without SSL support should no longer trigger an exception.
diff --git a/README.rst b/README.rst
@@ -1,4 +1,4 @@
-AMQP-Storm 1.2.0-RC2
+AMQP-Storm 1.2.0
 -------------
 Thread-safe Python AMQP Client Library based on pamqp.
 

diff --git a/amqpstorm/__init__.py b/amqpstorm/__init__.py
@@ -1,5 +1,5 @@
 """AMQP-Storm."""
-__version__ = '1.2.0-RC2'
+__version__ = '1.2.0'
 __author__ = 'eandersson'
 
 import logging

diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 """
 
 setup(name='AMQP-Storm',
-      version='1.2.0-RC2',
+      version='1.2.0',
       description='Thread-safe Python AMQP Client Library based on pamqp.',
       long_description=long_description,
       author='Erik Olof Gunnar Andersson',