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 58C3EE1BB for ; Thu, 31 Jan 2013 11:41:31 +0000 (UTC) Received: (qmail 72211 invoked by uid 500); 31 Jan 2013 11:41:31 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 72161 invoked by uid 500); 31 Jan 2013 11:41:31 -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 72150 invoked by uid 99); 31 Jan 2013 11:41:31 -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, 31 Jan 2013 11:41:30 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B558D827DF9; Thu, 31 Jan 2013 11:41:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: slebresne@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch 'cassandra-1.2' into trunk Message-Id: <20130131114130.B558D827DF9@tyr.zones.apache.org> Date: Thu, 31 Jan 2013 11:41:30 +0000 (UTC) Updated Branches: refs/heads/trunk d66630d3f -> efa4ae1e5 Merge branch 'cassandra-1.2' into trunk Conflicts: test/unit/org/apache/cassandra/db/KeyCollisionTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/efa4ae1e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/efa4ae1e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/efa4ae1e Branch: refs/heads/trunk Commit: efa4ae1e5efa6ee42385d9d0211704faddc877f7 Parents: d66630d d4ce7be Author: Sylvain Lebresne Authored: Thu Jan 31 12:41:21 2013 +0100 Committer: Sylvain Lebresne Committed: Thu Jan 31 12:41:21 2013 +0100 ---------------------------------------------------------------------- .../org/apache/cassandra/db/KeyCollisionTest.java | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/efa4ae1e/test/unit/org/apache/cassandra/db/KeyCollisionTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/db/KeyCollisionTest.java index ab792d5,4d86bb7..085534d --- a/test/unit/org/apache/cassandra/db/KeyCollisionTest.java +++ b/test/unit/org/apache/cassandra/db/KeyCollisionTest.java @@@ -27,6 -27,9 +27,8 @@@ import org.junit.Test import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.db.columniterator.IdentityQueryFilter; -import org.apache.cassandra.db.filter.QueryPath; + import org.apache.cassandra.db.marshal.AbstractType; + import org.apache.cassandra.db.marshal.IntegerType; import org.apache.cassandra.dht.*; import org.apache.cassandra.config.*; import org.apache.cassandra.service.StorageService;