From de1f24d70fbad84e449c81d3d46af3698f1f370f Mon Sep 17 00:00:00 2001
From: Michael Shuler <michael@pbandjelly.org>
Date: Tue, 21 Feb 2017 14:00:54 -0600
Subject: [PATCH] Increment to version 2.1.18

---
 CHANGES.txt      | 3 +++
 NEWS.txt         | 8 ++++++++
 build.xml        | 2 +-
 debian/changelog | 6 ++++++
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index a3de742433..22667718fe 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,6 @@
+2.1.18
+ * 
+
 2.1.17
  * Use portable stderr for java error in startup (CASSANDRA-13211)
  * Fix Thread Leak in OutboundTcpConnection (CASSANDRA-13204)
diff --git a/NEWS.txt b/NEWS.txt
index 65ccdc97e4..c5c798c7c4 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -13,6 +13,14 @@ restore snapshots created with the previous major version using the
 'sstableloader' tool. You can upgrade the file format of your snapshots
 using the provided 'sstableupgrade' tool.
 
+2.1.18
+======
+
+Upgrading
+---------
+    - Nothing specific to this release, but please see 2.1 if you are upgrading
+      from a previous version.
+
 2.1.17
 ======
 
diff --git a/build.xml b/build.xml
index 91dc34b7f1..94b1ed5649 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.1.17"/>
+    <property name="base.version" value="2.1.18"/>
     <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 ba9b91d9be..48ed24b41e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (2.1.18) UNRELEASED; urgency=medium
+
+  * New release
+
+ -- Michael Shuler <michael@pbandjelly.org>  Tue, 21 Feb 2017 13:59:40 -0600
+
 cassandra (2.1.17) unstable; urgency=medium
 
   * New release