You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2014/04/30 03:14:24 UTC
[1/2] git commit: Fix StorageProxy#syncWriteToBatchlog()
Repository: cassandra
Updated Branches:
refs/heads/trunk e02d5b354 -> d30b74515
Fix StorageProxy#syncWriteToBatchlog()
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/02ffaff6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/02ffaff6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/02ffaff6
Branch: refs/heads/trunk
Commit: 02ffaff69df86eab4f3f026732466b9eb1578314
Parents: a466432
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Wed Apr 30 03:11:24 2014 +0200
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Wed Apr 30 03:11:24 2014 +0200
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageProxy.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/02ffaff6/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 269d68f..1a41aaa 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -619,14 +619,15 @@ public class StorageProxy implements StorageProxyMBean
}
else if (targetVersion == MessagingService.current_version)
{
- MessagingService.instance().sendRR(message, target, handler);
+ MessagingService.instance().sendRR(message, target, handler, false);
}
else
{
MessagingService.instance().sendRR(BatchlogManager.getBatchlogMutationFor(mutations, uuid, targetVersion)
.createMessage(),
target,
- handler);
+ handler,
+ false);
}
}
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d30b7451
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d30b7451
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d30b7451
Branch: refs/heads/trunk
Commit: d30b745154da9daf0fd91dfc758a6b39e69f4a16
Parents: e02d5b3 02ffaff
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Wed Apr 30 03:14:11 2014 +0200
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Wed Apr 30 03:14:11 2014 +0200
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageProxy.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------