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/12/06 23:22:04 UTC
[4/6] git commit: fix merge
fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b4f36930
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b4f36930
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b4f36930
Branch: refs/heads/trunk
Commit: b4f369301a17b62b1806e51c72a76c8743b830f0
Parents: b537567
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Dec 6 16:21:48 2012 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Dec 6 16:21:48 2012 -0600
----------------------------------------------------------------------
.../apache/cassandra/service/MigrationManager.java | 17 ++++----------
1 files changed, 5 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4f36930/src/java/org/apache/cassandra/service/MigrationManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/MigrationManager.java b/src/java/org/apache/cassandra/service/MigrationManager.java
index 4cffdfc..9b9fed1 100644
--- a/src/java/org/apache/cassandra/service/MigrationManager.java
+++ b/src/java/org/apache/cassandra/service/MigrationManager.java
@@ -17,22 +17,15 @@
*/
package org.apache.cassandra.service;
-import java.io.*;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
import java.net.InetAddress;
import java.nio.ByteBuffer;
import java.util.*;
-<<<<<<< HEAD
-import java.util.concurrent.Callable;
import java.util.concurrent.CopyOnWriteArrayList;
-||||||| merged common ancestors
-import java.util.concurrent.Callable;
-=======
->>>>>>> cassandra-1.1
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.UUID;
import java.util.concurrent.TimeUnit;
import org.slf4j.Logger;
@@ -41,13 +34,13 @@ import org.slf4j.LoggerFactory;
import org.apache.cassandra.concurrent.Stage;
import org.apache.cassandra.concurrent.StageManager;
import org.apache.cassandra.config.CFMetaData;
-import org.apache.cassandra.exceptions.AlreadyExistsException;
-import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.config.KSMetaData;
import org.apache.cassandra.config.Schema;
import org.apache.cassandra.db.*;
import org.apache.cassandra.db.filter.QueryFilter;
import org.apache.cassandra.db.filter.QueryPath;
+import org.apache.cassandra.exceptions.AlreadyExistsException;
+import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.gms.*;
import org.apache.cassandra.io.IVersionedSerializer;
import org.apache.cassandra.net.MessageOut;