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 2014/09/19 16:15:56 UTC
[1/3] git commit: comment
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 7cfd3ed12 -> 1949212f5
refs/heads/trunk 4c80d0fbe -> bcec4ea3d
comment
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1949212f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1949212f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1949212f
Branch: refs/heads/cassandra-2.1
Commit: 1949212f5415dcb6026cef98ae23aa1a11ed3935
Parents: 7cfd3ed
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Sep 19 09:15:01 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Sep 19 09:15:06 2014 -0500
----------------------------------------------------------------------
.../org/apache/cassandra/service/AbstractWriteResponseHandler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1949212f/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java b/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java
index ece9289..72e5b9c 100644
--- a/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java
+++ b/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java
@@ -86,7 +86,7 @@ public abstract class AbstractWriteResponseHandler implements IAsyncCallback
int blockedFor = totalBlockFor();
// It's pretty unlikely, but we can race between exiting await above and here, so
// that we could now have enough acks. In that case, we "lie" on the acks count to
- // avoid sending confusing info to the user (see CASSANDRA-).
+ // avoid sending confusing info to the user (see CASSANDRA-6491).
if (acks >= blockedFor)
acks = blockedFor - 1;
throw new WriteTimeoutException(writeType, consistencyLevel, acks, blockedFor);
[2/3] git commit: comment
Posted by jb...@apache.org.
comment
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1949212f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1949212f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1949212f
Branch: refs/heads/trunk
Commit: 1949212f5415dcb6026cef98ae23aa1a11ed3935
Parents: 7cfd3ed
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Sep 19 09:15:01 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Sep 19 09:15:06 2014 -0500
----------------------------------------------------------------------
.../org/apache/cassandra/service/AbstractWriteResponseHandler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1949212f/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java b/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java
index ece9289..72e5b9c 100644
--- a/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java
+++ b/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java
@@ -86,7 +86,7 @@ public abstract class AbstractWriteResponseHandler implements IAsyncCallback
int blockedFor = totalBlockFor();
// It's pretty unlikely, but we can race between exiting await above and here, so
// that we could now have enough acks. In that case, we "lie" on the acks count to
- // avoid sending confusing info to the user (see CASSANDRA-).
+ // avoid sending confusing info to the user (see CASSANDRA-6491).
if (acks >= blockedFor)
acks = blockedFor - 1;
throw new WriteTimeoutException(writeType, consistencyLevel, acks, blockedFor);
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by jb...@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/bcec4ea3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bcec4ea3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bcec4ea3
Branch: refs/heads/trunk
Commit: bcec4ea3d19feba3b4c8089872cea8cc070f44b9
Parents: 4c80d0f 1949212
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Sep 19 09:15:48 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Sep 19 09:15:48 2014 -0500
----------------------------------------------------------------------
.../org/apache/cassandra/service/AbstractWriteResponseHandler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------