Update changelog, bump version to 1.0.0b5

thobbs · thobbs · commit 3ab5dc82de64 · 2013-10-10T17:11:36.000-05:00
diff --git 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
@@ -1,4 +1,4 @@
-__version_info__ = (1, 0, '0b4', 'post')
+__version_info__ = (1, 0, '0b5')
 __version__ = '.'.join(map(str, __version_info__))
 
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-__version_info__ = (1, 0, '0b4', 'post')`
	`1`	`+__version_info__ = (1, 0, '0b5')`
`2`	`2`	`__version__ = '.'.join(map(str, __version_info__))`
`3`	`3`
`4`	`4`