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 2012/02/27 20:44:57 UTC
[1/6] git commit: merge from 1.1
Updated Branches:
refs/heads/cassandra-1.1 ae3d197a8 -> 39b501561
refs/heads/cassandra-1.1.0 85934a1e2 -> a043998c9
refs/heads/trunk 7f182c362 -> a91b258dc
merge from 1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a91b258d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a91b258d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a91b258d
Branch: refs/heads/trunk
Commit: a91b258dcb20316a650a8355be3949487c292a94
Parents: 7f182c3 39b5015
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Feb 27 13:44:44 2012 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Feb 27 13:44:44 2012 -0600
----------------------------------------------------------------------
CHANGES.txt | 7 ++++++-
.../apache/cassandra/db/HintedHandOffManager.java | 12 +-----------
2 files changed, 7 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a91b258d/src/java/org/apache/cassandra/db/HintedHandOffManager.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/HintedHandOffManager.java
index 6ec3d79,8e6acb2..ec62f24
--- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java
+++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
@@@ -266,11 -267,10 +266,10 @@@ public class HintedHandOffManager imple
if (hintStore.isEmpty())
return; // nothing to do, don't confuse users by logging a no-op handoff
- logger_.debug("Checking remote({}) schema before delivering hints", endpoint);
+ logger.debug("Checking remote({}) schema before delivering hints", endpoint);
- int waited;
try
{
- waited = waitForSchemaAgreement(endpoint);
+ waitForSchemaAgreement(endpoint);
}
catch (TimeoutException e)
{