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:08:13 UTC
[1/6] git commit: fix addCallback for XDC requests too
Updated Branches:
refs/heads/cassandra-1.2 92b3622dc -> 6025ba85b
refs/heads/cassandra-2.0 7d8a56df3 -> ff7d341ef
refs/heads/trunk 9b06e48bb -> 188a8b36e
fix addCallback for XDC requests too
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6025ba85
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6025ba85
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6025ba85
Branch: refs/heads/cassandra-1.2
Commit: 6025ba85b3b092bb46f4242961ea69761c1ab93e
Parents: 92b3622
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Oct 3 22:06:20 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Oct 3 22:06:20 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/6025ba85/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 9b559e5..f925fa7 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -659,7 +659,7 @@ public class StorageProxy implements StorageProxyMBean
{
InetAddress destination = iter.next();
CompactEndpointSerializationHelper.serialize(destination, dos);
- String id = MessagingService.instance().addCallback(handler, message, destination, message.getTimeout());
+ String id = MessagingService.instance().addCallback(handler, message, destination, message.getTimeout(), handler.consistencyLevel);
dos.writeUTF(id);
}
message = message.withParameter(RowMutation.FORWARD_TO, bos.toByteArray());
[2/6] git commit: fix addCallback for XDC requests too
Posted by jb...@apache.org.
fix addCallback for XDC requests too
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6025ba85
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6025ba85
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6025ba85
Branch: refs/heads/cassandra-2.0
Commit: 6025ba85b3b092bb46f4242961ea69761c1ab93e
Parents: 92b3622
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Oct 3 22:06:20 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Oct 3 22:06:20 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/6025ba85/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 9b559e5..f925fa7 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -659,7 +659,7 @@ public class StorageProxy implements StorageProxyMBean
{
InetAddress destination = iter.next();
CompactEndpointSerializationHelper.serialize(destination, dos);
- String id = MessagingService.instance().addCallback(handler, message, destination, message.getTimeout());
+ String id = MessagingService.instance().addCallback(handler, message, destination, message.getTimeout(), handler.consistencyLevel);
dos.writeUTF(id);
}
message = message.withParameter(RowMutation.FORWARD_TO, bos.toByteArray());
[3/6] git commit: fix addCallback for XDC requests too
Posted by jb...@apache.org.
fix addCallback for XDC requests too
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6025ba85
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6025ba85
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6025ba85
Branch: refs/heads/trunk
Commit: 6025ba85b3b092bb46f4242961ea69761c1ab93e
Parents: 92b3622
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Oct 3 22:06:20 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Oct 3 22:06:20 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/6025ba85/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 9b559e5..f925fa7 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -659,7 +659,7 @@ public class StorageProxy implements StorageProxyMBean
{
InetAddress destination = iter.next();
CompactEndpointSerializationHelper.serialize(destination, dos);
- String id = MessagingService.instance().addCallback(handler, message, destination, message.getTimeout());
+ String id = MessagingService.instance().addCallback(handler, message, destination, message.getTimeout(), handler.consistencyLevel);
dos.writeUTF(id);
}
message = message.withParameter(RowMutation.FORWARD_TO, bos.toByteArray());
[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/188a8b36
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/188a8b36
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/188a8b36
Branch: refs/heads/trunk
Commit: 188a8b36eff4d6e206ccd99fa226bfa54833b522
Parents: 9b06e48 ff7d341
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Oct 3 22:07:46 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Oct 3 22:07:46 2013 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[4/6] git commit: merge from 1.2
Posted by jb...@apache.org.
merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ff7d341e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ff7d341e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ff7d341e
Branch: refs/heads/trunk
Commit: ff7d341eff3e1342ac937c5e116de3ddbfcbae9a
Parents: 7d8a56d 6025ba8
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Oct 3 22:07:42 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Oct 3 22:07:42 2013 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[5/6] git commit: merge from 1.2
Posted by jb...@apache.org.
merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ff7d341e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ff7d341e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ff7d341e
Branch: refs/heads/cassandra-2.0
Commit: ff7d341eff3e1342ac937c5e116de3ddbfcbae9a
Parents: 7d8a56d 6025ba8
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Oct 3 22:07:42 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Oct 3 22:07:42 2013 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------