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/04 05:20:03 UTC

[1/6] git commit: last one?

Updated Branches:
  refs/heads/cassandra-1.2 adb3a0dd7 -> 731e83b7f
  refs/heads/cassandra-2.0 ef69bd532 -> 213f6bb88
  refs/heads/trunk 53ac6b203 -> 6dda6f2d8


last one?


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/731e83b7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/731e83b7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/731e83b7

Branch: refs/heads/cassandra-1.2
Commit: 731e83b7ffd764ad98405e130e00ada0d08d6b45
Parents: adb3a0d
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Oct 3 22:19:15 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Oct 3 22:19:15 2013 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/service/StorageProxy.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/731e83b7/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java
index ec33723..c0b7271 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -665,7 +665,7 @@ public class StorageProxy implements StorageProxyMBean
         message = message.withParameter(RowMutation.FORWARD_TO, bos.toByteArray());
         // send the combined message + forward headers
         Tracing.trace("Enqueuing message to {}", target);
-        MessagingService.instance().sendRR(message, target, handler);
+        MessagingService.instance().sendRR(message, target, handler, message.getTimeout(), handler.consistencyLevel);
     }
 
     private static void insertLocal(final RowMutation rm, final AbstractWriteResponseHandler responseHandler)

[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

Posted by jb...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/213f6bb8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/213f6bb8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/213f6bb8

Branch: refs/heads/trunk
Commit: 213f6bb883a3072855061ac2528b9403f05398e9
Parents: ef69bd5 731e83b
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Oct 3 22:19:36 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Oct 3 22:19:36 2013 -0500

----------------------------------------------------------------------

----------------------------------------------------------------------

[2/6] git commit: last one?

Posted by jb...@apache.org.
last one?


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/731e83b7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/731e83b7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/731e83b7

Branch: refs/heads/cassandra-2.0
Commit: 731e83b7ffd764ad98405e130e00ada0d08d6b45
Parents: adb3a0d
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Oct 3 22:19:15 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Oct 3 22:19:15 2013 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/service/StorageProxy.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/731e83b7/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java
index ec33723..c0b7271 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -665,7 +665,7 @@ public class StorageProxy implements StorageProxyMBean
         message = message.withParameter(RowMutation.FORWARD_TO, bos.toByteArray());
         // send the combined message + forward headers
         Tracing.trace("Enqueuing message to {}", target);
-        MessagingService.instance().sendRR(message, target, handler);
+        MessagingService.instance().sendRR(message, target, handler, message.getTimeout(), handler.consistencyLevel);
     }
 
     private static void insertLocal(final RowMutation rm, final AbstractWriteResponseHandler responseHandler)

[5/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

Posted by jb...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/213f6bb8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/213f6bb8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/213f6bb8

Branch: refs/heads/cassandra-2.0
Commit: 213f6bb883a3072855061ac2528b9403f05398e9
Parents: ef69bd5 731e83b
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Oct 3 22:19:36 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Oct 3 22:19:36 2013 -0500

----------------------------------------------------------------------

----------------------------------------------------------------------

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

Posted by jb...@apache.org.
Merge branch 'cassandra-2.0' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6dda6f2d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6dda6f2d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6dda6f2d

Branch: refs/heads/trunk
Commit: 6dda6f2d8a0975a38f5c321805f0695928b77791
Parents: 53ac6b2 213f6bb
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Oct 3 22:19:41 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Oct 3 22:19:41 2013 -0500

----------------------------------------------------------------------

----------------------------------------------------------------------

[3/6] git commit: last one?

Posted by jb...@apache.org.
last one?


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/731e83b7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/731e83b7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/731e83b7

Branch: refs/heads/trunk
Commit: 731e83b7ffd764ad98405e130e00ada0d08d6b45
Parents: adb3a0d
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Oct 3 22:19:15 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Oct 3 22:19:15 2013 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/service/StorageProxy.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/731e83b7/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java
index ec33723..c0b7271 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -665,7 +665,7 @@ public class StorageProxy implements StorageProxyMBean
         message = message.withParameter(RowMutation.FORWARD_TO, bos.toByteArray());
         // send the combined message + forward headers
         Tracing.trace("Enqueuing message to {}", target);
-        MessagingService.instance().sendRR(message, target, handler);
+        MessagingService.instance().sendRR(message, target, handler, message.getTimeout(), handler.consistencyLevel);
     }
 
     private static void insertLocal(final RowMutation rm, final AbstractWriteResponseHandler responseHandler)