You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2015/08/25 19:49:19 UTC
[1/6] cassandra git commit: bump versions
Repository: cassandra
Updated Branches:
refs/heads/trunk aabad85fb -> 4acd4bbca
bump versions
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/32389064
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/32389064
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/32389064
Branch: refs/heads/trunk
Commit: 323890647718d6e061349cf8cbe857b95bd02b13
Parents: 842f150
Author: T Jake Luciani <ja...@apache.org>
Authored: Tue Aug 25 13:24:57 2015 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Tue Aug 25 13:24:57 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/32389064/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index a9cf70d..fa95cfa 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.2.1
+=====
+
+Upgrading
+---------
+ - Nothing specific to this release, but please see 2.2 if you are upgrading
+ from a previous version.
+
2.2
===
http://git-wip-us.apache.org/repos/asf/cassandra/blob/32389064/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 26c3524..886eb7b 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.0"/>
+ <property name="base.version" value="2.2.1"/>
<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/32389064/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index ce89ff9..685213c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (2.2.1) unstable; urgency=medium
+
+ * New release
+
+ -- Jake Luciani <ja...@apache.org> Tue, 25 Aug 2015 13:22:45 -0400
+
cassandra (2.2.0) unstable; urgency=medium
* New release
[2/6] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by ty...@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/d1ff5317
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d1ff5317
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d1ff5317
Branch: refs/heads/trunk
Commit: d1ff53171da6348178d029a0fab392849f4d81ce
Parents: f490cce 3238906
Author: T Jake Luciani <ja...@apache.org>
Authored: Tue Aug 25 13:25:38 2015 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Tue Aug 25 13:25:38 2015 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by ty...@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/f545a702
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f545a702
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f545a702
Branch: refs/heads/trunk
Commit: f545a7022da0111893bf84e376e68fc6cc46b55e
Parents: d1ff531 1dc19a6
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Tue Aug 25 12:48:25 2015 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Tue Aug 25 12:48:25 2015 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[3/6] cassandra git commit: Fix CHANGELOG version for CASSANDRA-9232
Posted by ty...@apache.org.
Fix CHANGELOG version for CASSANDRA-9232
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/15293a73
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/15293a73
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/15293a73
Branch: refs/heads/trunk
Commit: 15293a73b8bc6840a272f95ae6e32b9b0f90a3bc
Parents: 386f197
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Tue Aug 25 12:46:17 2015 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Tue Aug 25 12:46:17 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/15293a73/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 92dcf59..2e3fb7d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,8 @@
-2.1.9
+2.1.10
* (cqlsh) update list of CQL keywords (CASSANDRA-9232)
+
+
+2.1.9
* Avoid race condition during read repair (CASSANDRA-9460)
* (cqlsh) default load-from-file encoding to utf-8 (CASSANDRA-9898)
* Avoid returning Permission.NONE when failing to query users table (CASSANDRA-10168)
[4/6] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by ty...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1dc19a66
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1dc19a66
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1dc19a66
Branch: refs/heads/trunk
Commit: 1dc19a666d1da7efd4f017e70bc275ca2897a711
Parents: 3238906 15293a7
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Tue Aug 25 12:47:32 2015 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Tue Aug 25 12:47:32 2015 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[6/6] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by ty...@apache.org.
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4acd4bbc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4acd4bbc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4acd4bbc
Branch: refs/heads/trunk
Commit: 4acd4bbcaab3ddb2dc006834b255abb5a330014a
Parents: aabad85 f545a70
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Tue Aug 25 12:49:07 2015 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Tue Aug 25 12:49:07 2015 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------