Update news, version in preparation for 1.2.15
diff --git a/CHANGES.txt b/CHANGES.txt
index 75c7104..0989dc4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,7 @@
* Move handling of migration event source to solve bootstrap race (CASSANDRA-6648)
* Make sure compaction throughput value doesn't overflow with int math (CASSANDRA-6647)
+
1.2.14
* Reverted code to limit CQL prepared statement cache by size (CASSANDRA-6592)
* add cassandra.default_messaging_version property to allow easier
diff --git a/NEWS.txt b/NEWS.txt
index 53cb7ca..771536d 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -14,6 +14,16 @@
using the provided 'sstableupgrade' tool.
+1.2.15
+======
+
+Upgrading
+---------
+ - This release mainly fix a regression of 1.2.14, namely
+ https://issues.apache.org/jira/browse/CASSANDRA-6648. Users of 1.2.14 are
+ strongly encouraged to upgrade.
+
+
1.2.14
======
diff --git a/build.xml b/build.xml
index 150e2fe..ce87a2a 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.2.14"/>
+ <property name="base.version" value="1.2.15"/>
<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 472063e..bb8ecf2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (1.2.15) unstable; urgency=low
+
+ * New release
+
+ -- Sylvain Lebresne <slebresne@apache.org> Wed, 05 Feb 2014 08:42:29 +0100
+
cassandra (1.2.14) unstable; urgency=low
* New release
