From 3ab5dc82de64665efbecd92400bb8443b8270534 Mon Sep 17 00:00:00 2001
From: Tyler Hobbs <tyler@datastax.com>
Date: Thu, 10 Oct 2013 17:11:36 -0500
Subject: [PATCH] Update changelog, bump version to 1.0.0b5

---
 CHANGELOG.rst         | 23 +++++++++++++++++++++++
 cassandra/__init__.py |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 3be2f4ae..445a6d6c 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,26 @@
+1.0.0b5
+========
+Oct 10, 2013
+
+Features
+--------
+* SSL support
+
+Bug Fixes
+---------
+* Avoid KeyError when building replica map for NetworkTopologyStrategy
+* Work around python bug which causes deadlock when a thread imports
+  the utf8 module
+* Handle no blist library, which is not compatible with pypy
+* Avoid deadlock triggered by a keyspace being set on a connection (which
+  may happen automatically for new connections)
+
+Other
+-----
+* Switch packaging from Distribute to setuptools, improved C extension
+  support
+* Use PEP 386 compliant beta and post-release versions
+
 1.0.0-beta4
 ===========
 Sep 24, 2013
diff --git a/cassandra/__init__.py b/cassandra/__init__.py
index c8413bab..e97deab0 100644
--- a/cassandra/__init__.py
+++ b/cassandra/__init__.py
@@ -1,4 +1,4 @@
-__version_info__ = (1, 0, '0b4', 'post')
+__version_info__ = (1, 0, '0b5')
 __version__ = '.'.join(map(str, __version_info__))