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 A2375101AA for ; Thu, 19 Sep 2013 22:45:55 +0000 (UTC) Received: (qmail 98517 invoked by uid 500); 19 Sep 2013 22:45:54 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 98471 invoked by uid 500); 19 Sep 2013 22:45:54 -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 98380 invoked by uid 99); 19 Sep 2013 22:45:54 -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, 19 Sep 2013 22:45:54 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1E5AF8A345C; Thu, 19 Sep 2013 22:45:53 +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 Date: Thu, 19 Sep 2013 22:45:55 -0000 Message-Id: <6cc5fb70b3ca4591a7b7e8208e1f65e6@git.apache.org> In-Reply-To: <6e385989c12f4f11953641cf972e0f5f@git.apache.org> References: <6e385989c12f4f11953641cf972e0f5f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/6] git commit: Merge branch 'cassandra-2.0' into trunk Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1257868e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1257868e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1257868e Branch: refs/heads/trunk Commit: 1257868e33827b6e367c6dc51cca4f67f948c9ae Parents: 6813123 e5cbde9 Author: Jonathan Ellis Authored: Thu Sep 19 17:44:33 2013 -0500 Committer: Jonathan Ellis Committed: Thu Sep 19 17:44:33 2013 -0500 ---------------------------------------------------------------------- .../cassandra/db/CollationController.java | 32 ++------- .../unit/org/apache/cassandra/SchemaLoader.java | 1 + .../cassandra/db/CollationControllerTest.java | 73 +++++++++++++++----- 3 files changed, 63 insertions(+), 43 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1257868e/test/unit/org/apache/cassandra/SchemaLoader.java ----------------------------------------------------------------------