From 00d1cb700ea79a9fb4faf0acfd656aeefb1368d4 Mon Sep 17 00:00:00 2001
From: Sylvain Lebresne <slebresne@apache.org>
Date: Fri, 4 Nov 2011 09:01:36 +0000
Subject: [PATCH] Update version and news for 1.0.2 release

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-1.0@1197436 13f79535-47bb-0310-9956-ffa450edef68
---
 NEWS.txt         | 13 +++++++++++++
 build.xml        |  2 +-
 debian/changelog |  6 ++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/NEWS.txt b/NEWS.txt
index d6c411b530..ffdc502f53 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -1,3 +1,16 @@
+1.0.2
+=====
+
+Upgrading
+---------
+    - Nothing specific to 1.0.2 but please see the 1.0 upgrading section if
+      upgrading from a version prior to 1.0.0
+
+Features
+--------
+    - Cassandra CLI queries now have timing information
+
+
 1.0.1
 =====
 
diff --git a/build.xml b/build.xml
index 499a2075b8..60840b4b78 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.1"/>
+    <property name="base.version" value="1.0.2"/>
     <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 640ae9ee0f..fe459f3530 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (1.0.2) unstable; urgency=low
+
+  * New release
+
+ -- Sylvain Lebresne <slebresne@apache.org>  Fri, 04 Nov 2011 10:00:12 +0100
+
 cassandra (1.0.1) unstable; urgency=low
 
   * New release