You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/10/09 00:29:46 UTC
[5/5] git commit: merge from 2.0
merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1612ad12
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1612ad12
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1612ad12
Branch: refs/heads/trunk
Commit: 1612ad12a2151bc4fb23123dfe7b5cc1961593dd
Parents: 465e90c 111c74e
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Oct 8 17:29:15 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Oct 8 17:29:15 2013 -0500
----------------------------------------------------------------------
NEWS.txt | 8 -----
.../apache/cassandra/net/MessagingService.java | 33 +++++++++++++-------
.../service/AbstractWriteResponseHandler.java | 2 +-
.../apache/cassandra/service/StorageProxy.java | 11 +++----
4 files changed, 28 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1612ad12/NEWS.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1612ad12/src/java/org/apache/cassandra/net/MessagingService.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1612ad12/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageProxy.java
index 102d8b5,3c68121..ce535c3
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@@ -864,9 -860,9 +864,9 @@@ public class StorageProxy implements St
String dc = DatabaseDescriptor.getEndpointSnitch().getDatacenter(destination);
// direct writes to local DC or old Cassandra versions
// (1.1 knows how to forward old-style String message IDs; updated to int in 2.0)
- if (localDataCenter.equals(dc) || MessagingService.instance().getVersion(destination) < MessagingService.VERSION_20)
+ if (localDataCenter.equals(dc))
{
- MessagingService.instance().sendRR(message, destination, responseHandler, message.getTimeout(), consistency_level);
+ MessagingService.instance().sendRR(message, destination, responseHandler);
}
else
{