From d10da15526cef59ee4837930eb1a2c185bab2e7e Mon Sep 17 00:00:00 2001
From: Sylvain Lebresne <sylvain@datastax.com>
Date: Wed, 11 Jan 2012 09:54:59 +0100
Subject: [PATCH] Fix changelog/news and update version for 1.0.7 release

---
 CHANGES.txt      |  6 ++++++
 NEWS.txt         | 15 +++++++++++++++
 build.xml        |  2 +-
 debian/changelog |  6 ++++++
 4 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index b31f3a007f..c0f2c6651a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -20,6 +20,12 @@
  * Fix assertion error for CF with gc_grace=0 (CASSANDRA-3579)
  * Shutdown ParallelCompaction reducer executor after use (CASSANDRA-3711)
  * Avoid < 0 value for pending tasks in leveled compaction (CASSANDRA-3693)
+ * Support TimeUUID in CassandraStorage (CASSANDRA-3327)
+ * Check schema is ready before continuin boostrapping (CASSANDRA-3629)
+ * Catch overflows during parsing of chunk_length_kb (CASSANDRA-3644)
+ * Improve stream protocol mismatch errors (CASSANDRA-3652)
+ * Avoid multiple thread doing HH to the same target (CASSANDRA-3681)
+ * Add JMX property for rp_timeout_in_ms (CASSANDRA-2940)
 Merged from 0.8:
  * avoid logging (harmless) exception when GC takes < 1ms (CASSANDRA-3656)
  * prevent new nodes from thinking down nodes are up forever (CASSANDRA-3626)
diff --git a/NEWS.txt b/NEWS.txt
index 6d956504ca..2356faad6f 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -8,6 +8,14 @@ upgrade, just in case you need to roll back to the previous version.
 (Cassandra version X + 1 will always be able to read data files created
 by version X, but the inverse is not necessarily the case.)
 
+1.0.7
+=====
+
+Upgrading
+---------
+    - Nothing specific to 1.0.7, please report to instruction for 1.0.6
+
+
 1.0.6
 =====
 
@@ -21,6 +29,13 @@ Upgrading
       setting the right value and then run scrub on the column family.
     - Please report to instruction for 1.0.5 if coming from an older version.
 
+Other
+-----
+    - Adds new setstreamthroughput to nodetool to configure streaming
+      throttling
+    - Adds JMX property to get/set rpc_timeout_in_ms at runtime
+    - Allow configuring (per-CF) bloom_filter_fp_chance
+
 
 1.0.5
 =====
diff --git a/build.xml b/build.xml
index 0cb7f9e419..7169ff05f5 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
     <property name="debuglevel" value="source,lines,vars"/>
 
     <!-- default version and SCM information (we need the default SCM info as people may checkout with git-svn) -->
-    <property name="base.version" value="1.0.6"/>
+    <property name="base.version" value="1.0.7"/>
     <property name="scm.default.path" value="cassandra/branches/cassandra-1.0.0"/>
     <property name="scm.default.connection" value="scm:svn:http://svn.apache.org/repos/asf/${scm.default.path}"/>
     <property name="scm.default.developerConnection" value="scm:svn:https://svn.apache.org/repos/asf/${scm.default.path}"/>
diff --git a/debian/changelog b/debian/changelog
index 9047f19df5..70578c8ea1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (1.0.7) unstable; urgency=low
+
+  * New release
+
+ -- Sylvain Lebresne <slebresne@apache.org>  Wed, 11 Jan 2012 09:53:43 +0100
+
 cassandra (1.0.6) unstable; urgency=low
 
   * New release