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/08/28 17:01:49 UTC
git commit: fix merge
Updated Branches:
refs/heads/trunk f5c19e84a -> 70754af41
fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/70754af4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/70754af4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/70754af4
Branch: refs/heads/trunk
Commit: 70754af41e3e3d38f66b55cb7eaa4b79bccc794b
Parents: f5c19e8
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Aug 28 09:59:08 2012 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Aug 28 09:59:08 2012 -0500
----------------------------------------------------------------------
.../apache/cassandra/db/HintedHandOffManager.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/70754af4/src/java/org/apache/cassandra/db/HintedHandOffManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/HintedHandOffManager.java b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
index 97bbb43..e271c78 100644
--- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java
+++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
@@ -43,6 +43,7 @@ import org.apache.cassandra.db.marshal.Int32Type;
import org.apache.cassandra.db.marshal.UUIDType;
import org.apache.cassandra.dht.IPartitioner;
import org.apache.cassandra.dht.Range;
+import org.apache.cassandra.dht.Token;
import org.apache.cassandra.gms.ApplicationState;
import org.apache.cassandra.gms.FailureDetector;
import org.apache.cassandra.gms.Gossiper;