merge from 1.0

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1198852 13f79535-47bb-0310-9956-ffa450edef68

NEWS.txt

@@ -12,6 +12,19 @@ Upgrading
       single-row and multiget reads already rejected ANY.)
 
 
+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
 =====
 

build.xml

@@ -347,7 +347,7 @@ url=${svn.entry.url}?pathrev=${svn.entry.commit.revision}
         <license name="The Apache Software License, Version 2.0" url="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
         <scm connection="${scm.connection}" developerConnection="${scm.developerConnection}" url="${scm.url}"/>
         <dependencyManagement>
-          <dependency groupId="org.xerial.snappy" artifactId="snappy-java" version="1.0.3"/>
+          <dependency groupId="org.xerial.snappy" artifactId="snappy-java" version="1.0.4.1"/>
           <dependency groupId="com.ning" artifactId="compress-lzf" version="0.8.4"/>
           <dependency groupId="com.google.guava" artifactId="guava" version="r08"/>
           <dependency groupId="commons-cli" artifactId="commons-cli" version="1.1"/>

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