From 4287fdc125b45f769d5b0103b5f4097ed47ef69c Mon Sep 17 00:00:00 2001 From: Tyler Hobbs Date: Tue, 6 May 2014 17:07:08 -0500 Subject: [PATCH] Minor readme and changelog tweaks --- CHANGELOG.rst | 11 +++++++---- README.rst | 2 ++ cassandra/__init__.py | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 951513a5..c13a83b5 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -10,13 +10,16 @@ driver will not hang. However, if you *do* have a reproduceable case where Cluster.shutdown() is not called and the driver hangs, please report it so that we can attempt to fix it. +If you're using the 2.0 driver against Cassandra 1.2, you will need +to set your protocol version to 1. For example: + + cluster = Cluster(..., protocol_version=1) + Features -------- * Support v2 of Cassandra's native protocol, which includes the following - new features: - * Automatic query paging support - * Protocol-level batch statements - * Lightweight transactions + new features: automatic query paging support, protocol-level batch statements, + and lightweight transactions * Support for Python 3.3 and 3.4 * Allow a default query timeout to be set per-Session diff --git a/README.rst b/README.rst index 0c340cc1..fa4eb285 100644 --- a/README.rst +++ b/README.rst @@ -8,6 +8,8 @@ A Python client driver for Apache Cassandra. This driver works exclusively with the Cassandra Query Language v3 (CQL3) and Cassandra's native protocol. +The driver supports Python 2.6, 2.7, 3.3, and 3.4. + Installation ------------ Installation through pip is recommended:: diff --git a/cassandra/__init__.py b/cassandra/__init__.py index 73b22ed8..4c2831e5 100644 --- a/cassandra/__init__.py +++ b/cassandra/__init__.py @@ -23,7 +23,7 @@ class NullHandler(logging.Handler): logging.getLogger('cassandra').addHandler(NullHandler()) -__version_info__ = (2, 0, '0b1') +__version_info__ = (2, 0, '0b1', 'post') __version__ = '.'.join(map(str, __version_info__))