You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sa...@apache.org on 2015/10/08 11:08:48 UTC
[06/10] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
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/4bdc7bd4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4bdc7bd4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4bdc7bd4
Branch: refs/heads/cassandra-2.2
Commit: 4bdc7bd407d5a377cff4134b6fb90f457058fab4
Parents: be89dae 484e645
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Thu Oct 8 10:02:12 2015 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Thu Oct 8 10:02:12 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/gms/Gossiper.java | 11 +++++++----
2 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4bdc7bd4/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 82ee94d,a9b11ae..d2510b6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,21 -1,8 +1,22 @@@
-2.1.11
- * Mark nodes as dead even if they've already left (CASSANDRA-10205)
+2.2.3
+ * Make Hadoop CF splits more polite to custom orderered partitioners (CASSANDRA-10400)
+Merged from 2.1:
* Update internal python driver used by cqlsh (CASSANDRA-10161)
-2.1.10
+2.2.2
+ * cqlsh prompt includes name of keyspace after failed `use` statement (CASSANDRA-10369)
+ * Configurable page size in cqlsh (CASSANDRA-9855)
+ * Defer default role manager setup until all nodes are on 2.2+ (CASSANDRA-9761)
+ * Cancel transaction for sstables we wont redistribute index summary
+ for (CASSANDRA-10270)
+ * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209)
+ * Retry snapshot deletion after compaction and gc on Windows (CASSANDRA-10222)
+ * Fix failure to start with space in directory path on Windows (CASSANDRA-10239)
+ * Fix repair hang when snapshot failed (CASSANDRA-10057)
+ * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks
+ (CASSANDRA-10199)
+Merged from 2.1:
++ * Mark nodes as dead even if they've already left (CASSANDRA-10205)
* Bulk Loader API could not tolerate even node failure (CASSANDRA-10347)
* Avoid misleading pushed notifications when multiple nodes
share an rpc_address (CASSANDRA-10052)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4bdc7bd4/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------