You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2015/07/24 22:51:56 UTC
[15/15] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/76480b34
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/76480b34
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/76480b34
Branch: refs/heads/trunk
Commit: 76480b345a25c55597b827a245365ce7397b7250
Parents: b09e60f 6f0c7d9
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jul 24 15:51:29 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jul 24 15:51:29 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 +
.../cassandra/net/IncomingTcpConnection.java | 9 +-
.../cassandra/net/MessageDeliveryTask.java | 10 +-
.../apache/cassandra/net/MessagingService.java | 137 +++++++++++++------
.../cassandra/net/MessagingServiceTest.java | 37 +++++
5 files changed, 147 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/76480b34/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a0dadc3,17ec705..e3323f7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -30,8 -2,9 +30,10 @@@
* UDF / UDA execution time in trace (CASSANDRA-9723)
* Remove repair snapshot leftover on startup (CASSANDRA-7357)
* Use random nodes for batch log when only 2 racks (CASSANDRA-8735)
+ Merged from 2.0:
+ * Log when messages are dropped due to cross_node_timeout (CASSANDRA-9793)
+
2.2.0
* Fix cqlsh copy methods and other windows specific issues (CASSANDRA-9795)
* Don't wrap byte arrays in SequentialWriter (CASSANDRA-9797)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/76480b34/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/76480b34/src/java/org/apache/cassandra/net/MessagingService.java
----------------------------------------------------------------------