From fe6980eb7d2df6cb53fd8a83226f91789beaced8 Mon Sep 17 00:00:00 2001
From: Sylvain Lebresne <sylvain@datastax.com>
Date: Wed, 22 Feb 2012 15:10:56 +0100
Subject: [PATCH] Fix version, licences and changelog for 1.0.8 release

---
 .rat-excludes                                 |  1 +
 CHANGES.txt                                   | 12 +++++++++++
 NEWS.txt                                      |  5 +++++
 build.xml                                     |  2 +-
 debian/changelog                              |  6 ++++++
 .../cassandra/cql/jdbc/ClientUtilsTest.java   | 21 +++++++++++++++++++
 6 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/.rat-excludes b/.rat-excludes
index 1ab279b4d7..963bb19751 100644
--- a/.rat-excludes
+++ b/.rat-excludes
@@ -14,6 +14,7 @@ build/**
 lib/licenses/*.txt
 .settings/**
 contrib/pig/example-script.pig
+contrib/pig/test/**
 **/cassandra.yaml
 **/*.db
 redhat/apache-cassandra.spec
diff --git a/CHANGES.txt b/CHANGES.txt
index 966f940279..9cb9414255 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -24,6 +24,18 @@
  * (cqlsh) ignore missing CfDef opts (CASSANDRA-3933)
  * (cqlsh) look for cqlshlib relative to realpath (CASSANDRA-3767)
  * Fix short read protection (CASSANDRA-3934)
+ * Make sure infered and actual schema match (CASSANDRA-3371)
+ * Fix NPE during HH delivery (CASSANDRA-3677)
+ * Don't put boostrapping node in 'hibernate' status (CASSANDRA-3737)
+ * Fix double quotes in windows bat files (CASSANDRA-3744)
+ * Fix bad validator lookup (CASSANDRA-3789)
+ * Fix soft reset in EC2MultiRegionSnitch (CASSANDRA-3835)
+ * Don't leave zombie connections with THSHA thrift server (CASSANDRA-3867)
+ * (cqlsh) fix deserialization of data (CASSANDRA-3874)
+ * Fix removetoken force causing an inconsistent state (CASSANDRA-3876)
+ * Fix ahndling of some types with Pig (CASSANDRA-3886)
+ * Don't allow to drop the system keyspace (CASSANDRA-3759)
+ * Make Pig deletes disabled by default and configurable (CASSANDRA-3628)
 Merged from 0.8:
  * (Pig) fix CassandraStorage to use correct comparator in Super ColumnFamily
    case (CASSANDRA-3251)
diff --git a/NEWS.txt b/NEWS.txt
index e36b9e87d6..d64c714557 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -11,10 +11,15 @@ by version X, but the inverse is not necessarily the case.)
 1.0.8
 =====
 
+Upgrading
+---------
+    - Nothing specific to 1.0.8
+
 Other
 -----
     - Allow configuring socket timeout for streaming
 
+
 1.0.7
 =====
 
diff --git a/build.xml b/build.xml
index 07a8af6779..c2e8768b4d 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.7"/>
+    <property name="base.version" value="1.0.8"/>
     <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 70578c8ea1..4e96e0cf76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (1.0.8) unstable; urgency=low
+
+  * New release
+
+ -- Sylvain Lebresne <slebresne@apache.org>  Wed, 22 Feb 2012 15:09:54 +0100
+
 cassandra (1.0.7) unstable; urgency=low
 
   * New release
diff --git a/test/unit/org/apache/cassandra/cql/jdbc/ClientUtilsTest.java b/test/unit/org/apache/cassandra/cql/jdbc/ClientUtilsTest.java
index 72240292e1..36fc004e68 100644
--- a/test/unit/org/apache/cassandra/cql/jdbc/ClientUtilsTest.java
+++ b/test/unit/org/apache/cassandra/cql/jdbc/ClientUtilsTest.java
@@ -1,4 +1,25 @@
 package org.apache.cassandra.cql.jdbc;
+/*
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ */
+
 
 import java.math.BigDecimal;
 import java.math.BigInteger;