From 656edc529db59f0002a7fb0eed93339071fd3974 Mon Sep 17 00:00:00 2001
From: Sylvain Lebresne <sylvain@datastax.com>
Date: Fri, 7 Mar 2014 13:20:03 +0100
Subject: [PATCH] Update version, news and license for 2.0.6

---
 NEWS.txt                                      | 19 +++++++++++++++++++
 build.xml                                     |  2 +-
 debian/changelog                              |  6 ++++++
 .../cassandra/hadoop/ReporterWrapper.java     | 19 ++++++++++++++++++-
 4 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/NEWS.txt b/NEWS.txt
index b18150f6d3..18f89bcbbc 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -14,6 +14,25 @@ restore snapshots created with the previous major version using the
 using the provided 'sstableupgrade' tool.
 
 
+2.0.6
+=====
+
+New features
+------------
+    - CQL now support static columns, allows to batch multiple conditional updates
+      and has a new syntax for slicing over multiple clustering columns
+      (http://goo.gl/B6qz4j).
+    - Repair can be restricted to a set of nodes using the -hosts option in nodetool.
+    - A new 'nodetool taketoken' command relocate tokens with vnodes.
+    - Hinted handoff can be enabled only for some data-centers (see
+      hinted_handoff_enabled in cassandra.yaml)
+
+Upgrading
+---------
+    - Nothing specific to this release, but please see 2.0.6 if you are upgrading
+      from a previous version.
+
+
 2.0.5
 =====
 
diff --git a/build.xml b/build.xml
index 70f514ce51..3e25e25e4d 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
     <property name="debuglevel" value="source,lines,vars"/>
 
     <!-- default version and SCM information -->
-    <property name="base.version" value="2.0.5"/>
+    <property name="base.version" value="2.0.6"/>
     <property name="scm.connection" value="scm:git://git.apache.org/cassandra.git"/>
     <property name="scm.developerConnection" value="scm:git://git.apache.org/cassandra.git"/>
     <property name="scm.url" value="http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=tree"/>
diff --git a/debian/changelog b/debian/changelog
index 0dd17d624d..6cc4391817 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (2.0.6) unstable; urgency=low
+
+  * New release
+
+ -- Sylvain Lebresne <slebresne@apache.org>  Fri, 07 Mar 2014 13:18:42 +0100
+
 cassandra (2.0.5) unstable; urgency=low
 
   * New release
diff --git a/src/java/org/apache/cassandra/hadoop/ReporterWrapper.java b/src/java/org/apache/cassandra/hadoop/ReporterWrapper.java
index 9940ba437f..9c9c61f225 100644
--- a/src/java/org/apache/cassandra/hadoop/ReporterWrapper.java
+++ b/src/java/org/apache/cassandra/hadoop/ReporterWrapper.java
@@ -1,3 +1,20 @@
+/*
+ * 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.
+ */
 package org.apache.cassandra.hadoop;
 
 import org.apache.hadoop.mapred.Counters;
@@ -54,4 +71,4 @@ public class ReporterWrapper extends StatusReporter implements Reporter {
     public void setStatus(String s) {
         wrappedReporter.setStatus(s);
     }
-}
\ No newline at end of file
+}