From 44e0b9655a015590e8aea19e296a9aaca1e18a26 Mon Sep 17 00:00:00 2001
From: Sylvain Lebresne <sylvain@datastax.com>
Date: Fri, 29 Jun 2012 16:59:00 +0200
Subject: [PATCH] Update version and NEWS for 1.1.2 release

---
 .rat-excludes    | 1 +
 NEWS.txt         | 9 +++++++++
 build.xml        | 2 +-
 debian/changelog | 6 ++++++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/.rat-excludes b/.rat-excludes
index f41d97a08d..a030f84d7b 100644
--- a/.rat-excludes
+++ b/.rat-excludes
@@ -27,6 +27,7 @@ conf/schema-sample.txt
 drivers/txpy/txcql/cassandra/*
 drivers/py/cql/cassandra/*
 doc/cql/CQL*
+doc/cql3/CQL*
 build.properties.default
 test/data/legacy-sstables/**
 examples/pig/**
diff --git a/NEWS.txt b/NEWS.txt
index 8eaf25ea97..9de9f21a33 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -9,6 +9,15 @@ upgrade, just in case you need to roll back to the previous version.
 by version X, but the inverse is not necessarily the case.)
 
 
+1.1.2
+=====
+
+Upgrading
+---------
+    - Nothing specific to this release, but please see 1.1 if you are upgrading
+      from a previous version.
+
+
 1.1.1
 =====
 
diff --git a/build.xml b/build.xml
index 0622db99af..60903a6cc9 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="1.1.1"/>
+    <property name="base.version" value="1.1.2"/>
     <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 0d6a31abbd..4b97f75c84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (1.1.2) unstable; urgency=low
+
+  * New release
+
+ -- Sylvain Lebresne <slebresne@apache.org>  Fri, 29 Jun 2012 16:56:29 +0200
+
 cassandra (1.1.1) unstable; urgency=low
 
   * New release