cassandra-commits mailing list archives

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

Branch: refs/heads/cassandra-3.0
Commit: 02e5478f05178cbc563605dcaa65de60066e046e
Parents: 3effec5 2267d79
Author: Yuki Morishita <yukim@apache.org>
Authored: Tue Sep 1 16:58:13 2015 -0500
Committer: Yuki Morishita <yukim@apache.org>
Committed: Tue Sep 1 16:58:13 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt                                           |  1 +
 .../cassandra/streaming/messages/StreamMessage.java   | 14 ++++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/02e5478f/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index ffff102,681a40b..91ae36c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
 -2.1.10
 +2.2.2
 + * 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 handling of streaming EOF (CASSANDRA-10206)
   * Only check KeyCache when it is enabled
   * Change streaming_socket_timeout_in_ms default to 1 hour (CASSANDRA-8611)
   * (cqlsh) update list of CQL keywords (CASSANDRA-9232)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/02e5478f/src/java/org/apache/cassandra/streaming/messages/StreamMessage.java
----------------------------------------------------------------------


Mime
View raw message