You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ms...@apache.org on 2017/02/21 20:08:11 UTC
[01/22] cassandra git commit: Increment to version 2.1.18
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 943db2488 -> de1f24d70
refs/heads/cassandra-2.2 c6462d793 -> 7841908c3
refs/heads/cassandra-3.0 502226474 -> 0eae9084e
refs/heads/cassandra-3.11 c382a900b -> c77d63ef5
refs/heads/trunk bda973264 -> 62c948704
Increment to version 2.1.18
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/de1f24d7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/de1f24d7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/de1f24d7
Branch: refs/heads/cassandra-2.1
Commit: de1f24d70fbad84e449c81d3d46af3698f1f370f
Parents: 943db24
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Tue Feb 21 14:00:54 2017 -0600
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Tue Feb 21 14:00:54 2017 -0600
----------------------------------------------------------------------
CHANGES.txt | 3 +++
NEWS.txt | 8 ++++++++
build.xml | 2 +-
debian/changelog | 6 ++++++
4 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/de1f24d7/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a3de742..2266771 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)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/de1f24d7/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 65ccdc9..c5c798c 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
======
http://git-wip-us.apache.org/repos/asf/cassandra/blob/de1f24d7/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 91dc34b..94b1ed5 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"/>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/de1f24d7/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index ba9b91d..48ed24b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (2.1.18) UNRELEASED; urgency=medium
+
+ * New release
+
+ -- Michael Shuler <mi...@pbandjelly.org> Tue, 21 Feb 2017 13:59:40 -0600
+
cassandra (2.1.17) unstable; urgency=medium
* New release
[09/22] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by ms...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/56382e38
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56382e38
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/56382e38
Branch: refs/heads/cassandra-3.0
Commit: 56382e3853d2fc8ec2a1253737eba5ecd64607c2
Parents: c6462d7 de1f24d
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Tue Feb 21 14:01:19 2017 -0600
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Tue Feb 21 14:01:19 2017 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
[06/22] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by ms...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/56382e38
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56382e38
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/56382e38
Branch: refs/heads/cassandra-2.2
Commit: 56382e3853d2fc8ec2a1253737eba5ecd64607c2
Parents: c6462d7 de1f24d
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Tue Feb 21 14:01:19 2017 -0600
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Tue Feb 21 14:01:19 2017 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
[02/22] cassandra git commit: Increment to version 2.1.18
Posted by ms...@apache.org.
Increment to version 2.1.18
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/de1f24d7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/de1f24d7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/de1f24d7
Branch: refs/heads/cassandra-3.11
Commit: de1f24d70fbad84e449c81d3d46af3698f1f370f
Parents: 943db24
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Tue Feb 21 14:00:54 2017 -0600
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Tue Feb 21 14:00:54 2017 -0600
----------------------------------------------------------------------
CHANGES.txt | 3 +++
NEWS.txt | 8 ++++++++
build.xml | 2 +-
debian/changelog | 6 ++++++
4 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/de1f24d7/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a3de742..2266771 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)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/de1f24d7/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 65ccdc9..c5c798c 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
======
http://git-wip-us.apache.org/repos/asf/cassandra/blob/de1f24d7/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 91dc34b..94b1ed5 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"/>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/de1f24d7/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index ba9b91d..48ed24b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (2.1.18) UNRELEASED; urgency=medium
+
+ * New release
+
+ -- Michael Shuler <mi...@pbandjelly.org> Tue, 21 Feb 2017 13:59:40 -0600
+
cassandra (2.1.17) unstable; urgency=medium
* New release
[07/22] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by ms...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/56382e38
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56382e38
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/56382e38
Branch: refs/heads/cassandra-3.11
Commit: 56382e3853d2fc8ec2a1253737eba5ecd64607c2
Parents: c6462d7 de1f24d
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Tue Feb 21 14:01:19 2017 -0600
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Tue Feb 21 14:01:19 2017 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
[08/22] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by ms...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/56382e38
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56382e38
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/56382e38
Branch: refs/heads/trunk
Commit: 56382e3853d2fc8ec2a1253737eba5ecd64607c2
Parents: c6462d7 de1f24d
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Tue Feb 21 14:01:19 2017 -0600
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Tue Feb 21 14:01:19 2017 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
[22/22] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by ms...@apache.org.
Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/62c94870
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/62c94870
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/62c94870
Branch: refs/heads/trunk
Commit: 62c948704590fb49836814f59dac22ce958c5d70
Parents: bda9732 c77d63e
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Tue Feb 21 14:07:44 2017 -0600
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Tue Feb 21 14:07:44 2017 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
[21/22] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by ms...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c77d63ef
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c77d63ef
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c77d63ef
Branch: refs/heads/trunk
Commit: c77d63ef5a3ce58b96c4b1c1b862da61c5b9eb2b
Parents: c382a90 0eae908
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Tue Feb 21 14:07:29 2017 -0600
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Tue Feb 21 14:07:29 2017 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
[11/22] cassandra git commit: Increment to version 2.2.10
Posted by ms...@apache.org.
Increment to version 2.2.10
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7841908c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7841908c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7841908c
Branch: refs/heads/cassandra-3.11
Commit: 7841908c3c5b29849e05e5db4fef087855157872
Parents: 56382e3
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Tue Feb 21 14:03:53 2017 -0600
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Tue Feb 21 14:03:53 2017 -0600
----------------------------------------------------------------------
NEWS.txt | 8 ++++++++
build.xml | 2 +-
debian/changelog | 6 ++++++
3 files changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7841908c/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 06e9eeb..abc1bf5 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.2.10
+======
+
+Upgrading
+---------
+ - Nothing specific to this release, but please see 2.2 if you are upgrading
+ from a previous version.
+
2.2.9
=====
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7841908c/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 31c239b..53a1b27 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.2.9"/>
+ <property name="base.version" value="2.2.10"/>
<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"/>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7841908c/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 1be9edf..e561309 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (2.2.10) UNRELEASED; urgency=medium
+
+ * New release
+
+ -- Michael Shuler <mi...@pbandjelly.org> Tue, 21 Feb 2017 14:02:39 -0600
+
cassandra (2.2.9) unstable; urgency=medium
* New release
[19/22] cassandra git commit: Increment to version 3.0.12
Posted by ms...@apache.org.
Increment to version 3.0.12
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0eae9084
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0eae9084
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0eae9084
Branch: refs/heads/trunk
Commit: 0eae9084e674876ac339bcc34d4e135f89b4d2fb
Parents: 93baaea
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Tue Feb 21 14:07:09 2017 -0600
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Tue Feb 21 14:07:09 2017 -0600
----------------------------------------------------------------------
NEWS.txt | 12 ++++++++++--
build.xml | 2 +-
debian/changelog | 6 ++++++
3 files changed, 17 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0eae9084/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index a5ee496..6088dcf 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -13,8 +13,16 @@ 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.
+3.0.12
+======
+
+Upgrading
+---------
+ - Nothing specific to this release, but please see previous versions upgrading section,
+ especially if you are upgrading from 2.2.
+
3.0.11
-=====
+======
Upgrading
---------
@@ -34,7 +42,7 @@ Upgrading
replication settings and adjacent ranges are no longer merged (CASSANDRA-9639).
3.0.10
-=====
+======
Upgrading
---------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0eae9084/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 4e3011f..2d2d313 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="3.0.11"/>
+ <property name="base.version" value="3.0.12"/>
<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"/>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0eae9084/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 64cd73b..62873dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (3.0.12) UNRELEASED; urgency=medium
+
+ * New release
+
+ -- Michael Shuler <mi...@pbandjelly.org> Tue, 21 Feb 2017 14:06:07 -0600
+
cassandra (3.0.11) unstable; urgency=medium
* New release
[12/22] cassandra git commit: Increment to version 2.2.10
Posted by ms...@apache.org.
Increment to version 2.2.10
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7841908c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7841908c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7841908c
Branch: refs/heads/trunk
Commit: 7841908c3c5b29849e05e5db4fef087855157872
Parents: 56382e3
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Tue Feb 21 14:03:53 2017 -0600
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Tue Feb 21 14:03:53 2017 -0600
----------------------------------------------------------------------
NEWS.txt | 8 ++++++++
build.xml | 2 +-
debian/changelog | 6 ++++++
3 files changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7841908c/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 06e9eeb..abc1bf5 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.2.10
+======
+
+Upgrading
+---------
+ - Nothing specific to this release, but please see 2.2 if you are upgrading
+ from a previous version.
+
2.2.9
=====
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7841908c/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 31c239b..53a1b27 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.2.9"/>
+ <property name="base.version" value="2.2.10"/>
<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"/>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7841908c/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 1be9edf..e561309 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (2.2.10) UNRELEASED; urgency=medium
+
+ * New release
+
+ -- Michael Shuler <mi...@pbandjelly.org> Tue, 21 Feb 2017 14:02:39 -0600
+
cassandra (2.2.9) unstable; urgency=medium
* New release
[16/22] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by ms...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/93baaea9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/93baaea9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/93baaea9
Branch: refs/heads/trunk
Commit: 93baaea9b5d71c43896320c2e97b1bae01dbfbad
Parents: 5022264 7841908
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Tue Feb 21 14:04:08 2017 -0600
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Tue Feb 21 14:04:08 2017 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
[15/22] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by ms...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/93baaea9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/93baaea9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/93baaea9
Branch: refs/heads/cassandra-3.11
Commit: 93baaea9b5d71c43896320c2e97b1bae01dbfbad
Parents: 5022264 7841908
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Tue Feb 21 14:04:08 2017 -0600
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Tue Feb 21 14:04:08 2017 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
[14/22] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by ms...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/93baaea9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/93baaea9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/93baaea9
Branch: refs/heads/cassandra-3.0
Commit: 93baaea9b5d71c43896320c2e97b1bae01dbfbad
Parents: 5022264 7841908
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Tue Feb 21 14:04:08 2017 -0600
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Tue Feb 21 14:04:08 2017 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
[17/22] cassandra git commit: Increment to version 3.0.12
Posted by ms...@apache.org.
Increment to version 3.0.12
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0eae9084
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0eae9084
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0eae9084
Branch: refs/heads/cassandra-3.11
Commit: 0eae9084e674876ac339bcc34d4e135f89b4d2fb
Parents: 93baaea
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Tue Feb 21 14:07:09 2017 -0600
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Tue Feb 21 14:07:09 2017 -0600
----------------------------------------------------------------------
NEWS.txt | 12 ++++++++++--
build.xml | 2 +-
debian/changelog | 6 ++++++
3 files changed, 17 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0eae9084/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index a5ee496..6088dcf 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -13,8 +13,16 @@ 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.
+3.0.12
+======
+
+Upgrading
+---------
+ - Nothing specific to this release, but please see previous versions upgrading section,
+ especially if you are upgrading from 2.2.
+
3.0.11
-=====
+======
Upgrading
---------
@@ -34,7 +42,7 @@ Upgrading
replication settings and adjacent ranges are no longer merged (CASSANDRA-9639).
3.0.10
-=====
+======
Upgrading
---------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0eae9084/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 4e3011f..2d2d313 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="3.0.11"/>
+ <property name="base.version" value="3.0.12"/>
<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"/>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0eae9084/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 64cd73b..62873dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (3.0.12) UNRELEASED; urgency=medium
+
+ * New release
+
+ -- Michael Shuler <mi...@pbandjelly.org> Tue, 21 Feb 2017 14:06:07 -0600
+
cassandra (3.0.11) unstable; urgency=medium
* New release
[13/22] cassandra git commit: Increment to version 2.2.10
Posted by ms...@apache.org.
Increment to version 2.2.10
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7841908c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7841908c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7841908c
Branch: refs/heads/cassandra-2.2
Commit: 7841908c3c5b29849e05e5db4fef087855157872
Parents: 56382e3
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Tue Feb 21 14:03:53 2017 -0600
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Tue Feb 21 14:03:53 2017 -0600
----------------------------------------------------------------------
NEWS.txt | 8 ++++++++
build.xml | 2 +-
debian/changelog | 6 ++++++
3 files changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7841908c/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 06e9eeb..abc1bf5 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.2.10
+======
+
+Upgrading
+---------
+ - Nothing specific to this release, but please see 2.2 if you are upgrading
+ from a previous version.
+
2.2.9
=====
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7841908c/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 31c239b..53a1b27 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.2.9"/>
+ <property name="base.version" value="2.2.10"/>
<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"/>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7841908c/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 1be9edf..e561309 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (2.2.10) UNRELEASED; urgency=medium
+
+ * New release
+
+ -- Michael Shuler <mi...@pbandjelly.org> Tue, 21 Feb 2017 14:02:39 -0600
+
cassandra (2.2.9) unstable; urgency=medium
* New release
[20/22] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by ms...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c77d63ef
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c77d63ef
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c77d63ef
Branch: refs/heads/cassandra-3.11
Commit: c77d63ef5a3ce58b96c4b1c1b862da61c5b9eb2b
Parents: c382a90 0eae908
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Tue Feb 21 14:07:29 2017 -0600
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Tue Feb 21 14:07:29 2017 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
[10/22] cassandra git commit: Increment to version 2.2.10
Posted by ms...@apache.org.
Increment to version 2.2.10
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7841908c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7841908c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7841908c
Branch: refs/heads/cassandra-3.0
Commit: 7841908c3c5b29849e05e5db4fef087855157872
Parents: 56382e3
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Tue Feb 21 14:03:53 2017 -0600
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Tue Feb 21 14:03:53 2017 -0600
----------------------------------------------------------------------
NEWS.txt | 8 ++++++++
build.xml | 2 +-
debian/changelog | 6 ++++++
3 files changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7841908c/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 06e9eeb..abc1bf5 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.2.10
+======
+
+Upgrading
+---------
+ - Nothing specific to this release, but please see 2.2 if you are upgrading
+ from a previous version.
+
2.2.9
=====
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7841908c/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 31c239b..53a1b27 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.2.9"/>
+ <property name="base.version" value="2.2.10"/>
<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"/>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7841908c/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 1be9edf..e561309 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (2.2.10) UNRELEASED; urgency=medium
+
+ * New release
+
+ -- Michael Shuler <mi...@pbandjelly.org> Tue, 21 Feb 2017 14:02:39 -0600
+
cassandra (2.2.9) unstable; urgency=medium
* New release
[18/22] cassandra git commit: Increment to version 3.0.12
Posted by ms...@apache.org.
Increment to version 3.0.12
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0eae9084
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0eae9084
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0eae9084
Branch: refs/heads/cassandra-3.0
Commit: 0eae9084e674876ac339bcc34d4e135f89b4d2fb
Parents: 93baaea
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Tue Feb 21 14:07:09 2017 -0600
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Tue Feb 21 14:07:09 2017 -0600
----------------------------------------------------------------------
NEWS.txt | 12 ++++++++++--
build.xml | 2 +-
debian/changelog | 6 ++++++
3 files changed, 17 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0eae9084/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index a5ee496..6088dcf 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -13,8 +13,16 @@ 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.
+3.0.12
+======
+
+Upgrading
+---------
+ - Nothing specific to this release, but please see previous versions upgrading section,
+ especially if you are upgrading from 2.2.
+
3.0.11
-=====
+======
Upgrading
---------
@@ -34,7 +42,7 @@ Upgrading
replication settings and adjacent ranges are no longer merged (CASSANDRA-9639).
3.0.10
-=====
+======
Upgrading
---------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0eae9084/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 4e3011f..2d2d313 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="3.0.11"/>
+ <property name="base.version" value="3.0.12"/>
<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"/>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0eae9084/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 64cd73b..62873dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (3.0.12) UNRELEASED; urgency=medium
+
+ * New release
+
+ -- Michael Shuler <mi...@pbandjelly.org> Tue, 21 Feb 2017 14:06:07 -0600
+
cassandra (3.0.11) unstable; urgency=medium
* New release
[04/22] cassandra git commit: Increment to version 2.1.18
Posted by ms...@apache.org.
Increment to version 2.1.18
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/de1f24d7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/de1f24d7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/de1f24d7
Branch: refs/heads/trunk
Commit: de1f24d70fbad84e449c81d3d46af3698f1f370f
Parents: 943db24
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Tue Feb 21 14:00:54 2017 -0600
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Tue Feb 21 14:00:54 2017 -0600
----------------------------------------------------------------------
CHANGES.txt | 3 +++
NEWS.txt | 8 ++++++++
build.xml | 2 +-
debian/changelog | 6 ++++++
4 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/de1f24d7/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a3de742..2266771 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)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/de1f24d7/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 65ccdc9..c5c798c 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
======
http://git-wip-us.apache.org/repos/asf/cassandra/blob/de1f24d7/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 91dc34b..94b1ed5 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"/>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/de1f24d7/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index ba9b91d..48ed24b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (2.1.18) UNRELEASED; urgency=medium
+
+ * New release
+
+ -- Michael Shuler <mi...@pbandjelly.org> Tue, 21 Feb 2017 13:59:40 -0600
+
cassandra (2.1.17) unstable; urgency=medium
* New release
[05/22] cassandra git commit: Increment to version 2.1.18
Posted by ms...@apache.org.
Increment to version 2.1.18
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/de1f24d7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/de1f24d7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/de1f24d7
Branch: refs/heads/cassandra-3.0
Commit: de1f24d70fbad84e449c81d3d46af3698f1f370f
Parents: 943db24
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Tue Feb 21 14:00:54 2017 -0600
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Tue Feb 21 14:00:54 2017 -0600
----------------------------------------------------------------------
CHANGES.txt | 3 +++
NEWS.txt | 8 ++++++++
build.xml | 2 +-
debian/changelog | 6 ++++++
4 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/de1f24d7/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a3de742..2266771 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)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/de1f24d7/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 65ccdc9..c5c798c 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
======
http://git-wip-us.apache.org/repos/asf/cassandra/blob/de1f24d7/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 91dc34b..94b1ed5 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"/>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/de1f24d7/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index ba9b91d..48ed24b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (2.1.18) UNRELEASED; urgency=medium
+
+ * New release
+
+ -- Michael Shuler <mi...@pbandjelly.org> Tue, 21 Feb 2017 13:59:40 -0600
+
cassandra (2.1.17) unstable; urgency=medium
* New release
[03/22] cassandra git commit: Increment to version 2.1.18
Posted by ms...@apache.org.
Increment to version 2.1.18
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/de1f24d7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/de1f24d7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/de1f24d7
Branch: refs/heads/cassandra-2.2
Commit: de1f24d70fbad84e449c81d3d46af3698f1f370f
Parents: 943db24
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Tue Feb 21 14:00:54 2017 -0600
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Tue Feb 21 14:00:54 2017 -0600
----------------------------------------------------------------------
CHANGES.txt | 3 +++
NEWS.txt | 8 ++++++++
build.xml | 2 +-
debian/changelog | 6 ++++++
4 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/de1f24d7/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a3de742..2266771 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)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/de1f24d7/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 65ccdc9..c5c798c 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
======
http://git-wip-us.apache.org/repos/asf/cassandra/blob/de1f24d7/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 91dc34b..94b1ed5 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"/>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/de1f24d7/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index ba9b91d..48ed24b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (2.1.18) UNRELEASED; urgency=medium
+
+ * New release
+
+ -- Michael Shuler <mi...@pbandjelly.org> Tue, 21 Feb 2017 13:59:40 -0600
+
cassandra (2.1.17) unstable; urgency=medium
* New release