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 2015/01/17 02:08:58 UTC
[1/3] cassandra git commit: Ninja-fix CASSANDRA-8640
Repository: cassandra
Updated Branches:
refs/heads/trunk 8c4db1b0e -> 6ba099940
Ninja-fix CASSANDRA-8640
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ce207cba
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ce207cba
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ce207cba
Branch: refs/heads/trunk
Commit: ce207cba413381986324f2c8edad9e090e5be5b1
Parents: 61bd688
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sat Jan 17 04:06:21 2015 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sat Jan 17 04:06:21 2015 +0300
----------------------------------------------------------------------
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/ce207cba/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 1fd4079..fcc9665 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -314,7 +314,7 @@ public class StorageProxy implements StorageProxyMBean
pendingEndpoints = ImmutableList.copyOf(Iterables.filter(pendingEndpoints, isLocalDc));
}
int participants = pendingEndpoints.size() + naturalEndpoints.size();
- int requiredParticipants = (participants + 1) / 2; // See CASSANDRA-8346, CASSANDRA-833
+ int requiredParticipants = participants / 2 + 1; // See CASSANDRA-8346, CASSANDRA-833
List<InetAddress> liveEndpoints = ImmutableList.copyOf(Iterables.filter(Iterables.concat(naturalEndpoints, pendingEndpoints), IAsyncCallback.isAlive));
if (liveEndpoints.size() < requiredParticipants)
throw new UnavailableException(consistencyForPaxos, requiredParticipants, liveEndpoints.size());
[2/3] cassandra git commit: Merge branch 'cassandra-2.0' into
cassandra-2.1
Posted by al...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f88864cc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f88864cc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f88864cc
Branch: refs/heads/trunk
Commit: f88864cc6b56c95008896b6cb3e70cb2b8303a9a
Parents: e4e3fd9 ce207cb
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sat Jan 17 04:07:15 2015 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sat Jan 17 04:07:15 2015 +0300
----------------------------------------------------------------------
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/f88864cc/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
[3/3] cassandra 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/6ba09994
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6ba09994
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6ba09994
Branch: refs/heads/trunk
Commit: 6ba099940d71aee8aaea54ed898a1f4eaebf9296
Parents: 8c4db1b f88864c
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sat Jan 17 04:08:48 2015 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sat Jan 17 04:08:48 2015 +0300
----------------------------------------------------------------------
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/6ba09994/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------