Release ver and changelog update for 2.5.1

aholmberg · aholmberg · commit 28c870daf60e · 2015-04-23T15:17:55.000-05:00
Conflicts:
	cassandra/__init__.py
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,3 +1,13 @@
+2.5.1
+=====
+April 23, 2015
+
+Bug Fixes
+---------
+* Fix thread safety in DC-aware load balancing policy (PYTHON-297)
+* Fix race condition in node/token rebuild (PYTHON-298)
+* Set and send serial consistency parameter (PYTHON-299)
+
 2.5.0
 =====
 March 30, 2015
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, 5, 0)
+__version_info__ = (2, 5, 1)
 __version__ = '.'.join(map(str, __version_info__))
 
 
