From 5a6981eb66d6e24af4e294986c14eacd645a4e8d Mon Sep 17 00:00:00 2001
From: Sylvain Lebresne <sylvain@datastax.com>
Date: Thu, 13 Dec 2012 20:59:40 +0100
Subject: [PATCH] Update version, news and changelog for 1.1.8

---
 CHANGES.txt      |  7 +++++--
 NEWS.txt         | 18 ++++++++++++++++--
 build.xml        |  2 +-
 debian/changelog |  6 ++++++
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 75c715c55c..c9f1098bd7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
 1.1.8
+ * reset getRangeSlice filter after finishing a row for get_paged_slice
+   (CASSANDRA-4919)
  * fix temporarily missing schema after upgrade from pre-1.1.5 (CASSANDRA-5061)
  * reduce log spam from invalid counter shards (CASSANDRA-5026)
  * Improve schema propagation performance (CASSANDRA-5025)
@@ -6,14 +8,15 @@
  * Improve error reporting when streaming ranges fail (CASSANDRA-5009)
  * cqlsh: fix timestamp formatting on some platforms (CASSANDRA-5046)
  * Fix ALTER TABLE overriding compression options with defaults (CASSANDRA-4996)
+ * Avoid error opening data file on startup (CASSANDRA-4984)
+ * Fix wrong index_options in cli 'show schema' (CASSANDRA-5008)
+ * Allow overriding number of available processor (CASSANDRA-4790)
 
 
 1.1.7
  * cqlsh: improve COPY FROM performance (CASSANDRA-4921)
  * add basic authentication support for Pig CassandraStorage (CASSANDRA-3042)
  * fix CQL2 ALTER TABLE compaction_strategy_class altering (CASSANDRA-4965)
- * reset getRangeSlice filter after finishing a row for get_paged_slice
-   (CASSANDRA-4919)
  * expunge row cache post-truncate (CASSANDRA-4940)
  * remove IAuthority2 (CASSANDRA-4875)
  * add get[Row|Key]CacheEntries to CacheServiceMBean (CASSANDRA-4859)
diff --git a/NEWS.txt b/NEWS.txt
index 0431a3e726..8b69a317ab 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -8,14 +8,28 @@ upgrade, just in case you need to roll back to the previous version.
 (Cassandra version X + 1 will always be able to read data files created
 by version X, but the inverse is not necessarily the case.)
 
+1.1.8
+=====
+
+Upgrading
+---------
+    - Nothing specific to this release, but please see the previous instructions
+      if you are not upgrading from 1.1.7.
+
+Features
+--------
+    - It is now possible override the number of available processor
+      (with -Dcassandra.available_processors), which can useful when multiple
+      instance of Cassandra run on the same machine since Cassandra base some
+      sizings on that value.
 
 1.1.7
 =====
 
 Upgrading
 ---------
-    - Nothing specific to this release, but please see the previous instruction
-      if you are not upgrading from 1.1.7.
+    - Nothing specific to this release, but please see the previous instructions
+      if you are not upgrading from 1.1.6.
 
 
 1.1.6
diff --git a/build.xml b/build.xml
index 8ac0cca0d5..e39aeb6cd7 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.7"/>
+    <property name="base.version" value="1.1.8"/>
     <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 b2b17b1c6b..6d0a859336 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (1.1.8) unstable; urgency=low
+
+  * New release
+
+ -- Sylvain Lebresne <slebresne@apache.org>  Thu, 13 Dec 2012 20:58:35 +0100
+
 cassandra (1.1.7) unstable; urgency=low
 
   * New release