Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'cassandra-1.2' into trunk

  • Loading branch information...
commit ef379f280a4c181b1eb45717d970f6b30026cbec 2 parents 6c3e437 + 8c16833
@jbellis jbellis authored
Showing with 5 additions and 12 deletions.
  1. +5 −12 src/java/org/apache/cassandra/service/MigrationManager.java
View
17 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.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;
Please sign in to comment.
Something went wrong with that request. Please try again.