Update changelog, bump version to 1.10.0

tedcarroll · Oct 3, 2013 · a80ac67 · a80ac67
1 parent 3b2a893
commit a80ac67
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 2 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,13 @@
+Changes in Version 1.10.0
+
+    This release only adds one feature: support for Cassandra 1.2’s atomic
+    batches.
+    Features
+
+      * Add support for Cassandra 1.2+ atomic batches through a new atomic
+        parameter for batch.Mutator, batch.CfMutator, and ColumnFamily.batch().
+
+
 Changes in Version 1.9.1
 
     This release fixes a few edge cases around connection pooling that can affect

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+pycassa (1.10.0) unstable; urgency=low
+
+  * Add support for atomic batches 
+
+ -- Tyler Hobbs <tyler@datastax.com>  Thu, 03 Oct 2013 14:35:32 -0500
+
 pycassa (1.9.0-1) unstable; urgency=low
 
   * Add include_ttl support

diff --git a/doc/changelog.rst b/doc/changelog.rst
@@ -1,6 +1,17 @@
 Changelog
 =========
 
+Changes in Version 1.10.0
+-------------------------
+This release only adds one feature: support for Cassandra
+1.2's atomic batches.
+
+Features
+~~~~~~~~
+- Add support for Cassandra 1.2+ atomic batches through a new
+  ``atomic`` parameter for :class:`.batch.Mutator`,
+  :class:`.batch.CfMutator`, and :meth:`.ColumnFamily.batch()`.
+
 Changes in Version 1.9.1
 ------------------------
 This release fixes a few edge cases around connection pooling that

diff --git a/pycassa/__init__.py b/pycassa/__init__.py
@@ -10,5 +10,5 @@
 
 from pycassa.logging.pycassa_logger import *
 
-__version_info__ = (1, 9, '1+')
+__version_info__ = (1, 10, 0)
 __version__ = '.'.join(map(str, __version_info__))
diff --git a/setup.py b/setup.py
@@ -23,7 +23,7 @@
 
 from distutils.cmd import Command
 
-__version__ = "1.9.1+"
+__version__ = "1.10.0"
 
 long_description = """pycassa is a python client library for Apache Cassandra with the following features: