You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2015/06/08 19:58:33 UTC
[1/2] cassandra git commit: bump versions
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 46ce21c7b -> 9ecab2b53
bump versions
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e469f32b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e469f32b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e469f32b
Branch: refs/heads/cassandra-2.1
Commit: e469f32be180a1e493227111649d067a35201e97
Parents: 5d26943
Author: T Jake Luciani <ja...@apache.org>
Authored: Fri Jun 5 10:47:35 2015 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Fri Jun 5 10:47:35 2015 -0400
----------------------------------------------------------------------
NEWS.txt | 9 +++++++++
build.xml | 2 +-
debian/changelog | 6 ++++++
3 files changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e469f32b/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 2f4166a..272c837 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -13,6 +13,15 @@ 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.6
+=====
+
+Upgrading
+---------
+ - Nothing specific to this release, but please see 2.1 if you are upgrading
+ from a previous version.
+
+
2.1.5
=====
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e469f32b/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index e197696..adde1d3 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.5"/>
+ <property name="base.version" value="2.1.6"/>
<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/e469f32b/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 29308e6..1a742fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (2.1.6) unstable; urgency=medium
+
+ * New release
+
+ -- Jake Luciani <ja...@apache.org> Fri, 05 Jun 2015 10:21:39 -0400
+
cassandra (2.1.5) unstable; urgency=medium
* New release
[2/2] cassandra git commit: Merge branch '2.1.6build' into
cassandra-2.1
Posted by ja...@apache.org.
Merge branch '2.1.6build' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9ecab2b5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9ecab2b5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9ecab2b5
Branch: refs/heads/cassandra-2.1
Commit: 9ecab2b53d8ae847aa7e584c92ff74248c10bebe
Parents: 46ce21c e469f32
Author: T Jake Luciani <ja...@apache.org>
Authored: Mon Jun 8 13:57:08 2015 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Mon Jun 8 13:57:08 2015 -0400
----------------------------------------------------------------------
NEWS.txt | 9 +++++++++
build.xml | 2 +-
debian/changelog | 6 ++++++
3 files changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------