cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [06/10] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Tue, 29 Sep 2015 17:10:03 GMT
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/fc675450
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fc675450
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fc675450

Branch: refs/heads/cassandra-2.2
Commit: fc675450e9569a1555faa43c126cd0e5d91862e0
Parents: a323641 4c6411f
Author: Yuki Morishita <yukim@apache.org>
Authored: Tue Sep 29 12:00:24 2015 -0500
Committer: Yuki Morishita <yukim@apache.org>
Committed: Tue Sep 29 12:00:24 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt                                                  | 1 +
 src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 2 ++
 2 files changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc675450/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index f3a6d44,3364dcd..c36c6f5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,16 -1,5 +1,17 @@@
 -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:
+  * Fix dropping undroppable when message queue is full (CASSANDRA-10113)
   * Fix potential ClassCastException during paging (CASSANDRA-10352)
   * Prevent ALTER TYPE from creating circular references (CASSANDRA-10339)
   * Fix cache handling of 2i and base tables (CASSANDRA-10155, 10359)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc675450/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
----------------------------------------------------------------------


Mime
View raw message