Changelog and release version update.

aholmberg · aholmberg · commit 08f768aa2230 · 2015-06-25T08:52:41.000-05:00
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,5 +1,24 @@
+2.6.0c2
+=======
+June 24, 2015
+
+Features
+--------
+* Automatic Protocol Version Downgrade (PYTHON-240)
+* cqlengine Python 2.6 compatibility (PYTHON-288)
+* Double-dollar string quote UDF body (PYTHON-345)
+* Set models.DEFAULT_KEYSPACE when calling set_session (github #352)
+
+Bug Fixes
+---------
+* Avoid stall while connecting to mixed version cluster (PYTHON-303)
+* Make SSL work with AsyncoreConnection in python 2.6.9 (PYTHON-322)
+* Fix Murmur3Token.from_key() on Windows (PYTHON-331)
+* Fix cqlengine TimeUUID rounding error for Windows (PYTHON-341)
+* Avoid invalid compaction options in CQL export for non-SizeTiered (PYTHON-352)
+
 2.6.0c1
-=====
+=======
 June 4, 2015
 
 This release adds support for Cassandra 2.2 features, including version
diff --git a/cassandra/__init__.py b/cassandra/__init__.py
@@ -23,7 +23,7 @@ def emit(self, record):
 logging.getLogger('cassandra').addHandler(NullHandler())
 
 
-__version_info__ = (2, 6, '0c1', 'post')
+__version_info__ = (2, 6, '0c2')
 __version__ = '.'.join(map(str, __version_info__))
 
 
