Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 07FD0D803 for ; Thu, 6 Dec 2012 22:22:06 +0000 (UTC) Received: (qmail 70126 invoked by uid 500); 6 Dec 2012 22:22:05 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 70079 invoked by uid 500); 6 Dec 2012 22:22:05 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 70008 invoked by uid 99); 6 Dec 2012 22:22:05 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Dec 2012 22:22:05 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 11CBE81CDA4; Thu, 6 Dec 2012 22:22:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [5/6] git commit: fix merge Message-Id: <20121206222205.11CBE81CDA4@tyr.zones.apache.org> Date: Thu, 6 Dec 2012 22:22:05 +0000 (UTC) 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/cassandra-1.2.0 Commit: b4f369301a17b62b1806e51c72a76c8743b830f0 Parents: b537567 Author: Jonathan Ellis Authored: Thu Dec 6 16:21:48 2012 -0600 Committer: Jonathan Ellis 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;