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 E8BC211120 for ; Thu, 24 Apr 2014 03:00:42 +0000 (UTC) Received: (qmail 68612 invoked by uid 500); 24 Apr 2014 03:00:42 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 68485 invoked by uid 500); 24 Apr 2014 03:00:41 -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 68225 invoked by uid 99); 24 Apr 2014 03:00:39 -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, 24 Apr 2014 03:00:39 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C8609990225; Thu, 24 Apr 2014 03:00:38 +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, 24 Apr 2014 03:00:40 -0000 Message-Id: <44cb462f952146f28e63ff33d5e2b555@git.apache.org> In-Reply-To: <373c982821014b5a88ca5658c94d7382@git.apache.org> References: <373c982821014b5a88ca5658c94d7382@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Merge branch 'cassandra-2.1' into trunk Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cf74bcfc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cf74bcfc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cf74bcfc Branch: refs/heads/trunk Commit: cf74bcfc63f75c8ae188f804f3f42ef5cfc8379a Parents: e6325fa 647bfc6 Author: Jonathan Ellis Authored: Wed Apr 23 22:00:29 2014 -0500 Committer: Jonathan Ellis Committed: Wed Apr 23 22:00:29 2014 -0500 ---------------------------------------------------------------------- NEWS.txt | 3 +- .../apache/cassandra/tools/SSTableExport.java | 93 +++++-------- .../apache/cassandra/tools/SSTableImport.java | 133 ++++--------------- test/resources/CounterCF.json | 2 +- test/resources/SimpleCF.json | 4 +- test/resources/SimpleCF.oldformat.json | 4 - test/resources/SimpleCFWithDeletionInfo.json | 4 +- test/resources/SuperCF.json | 4 - test/resources/UnsortedCF.json | 4 +- test/resources/UnsortedSuperCF.json | 5 - .../cassandra/tools/SSTableExportTest.java | 40 +----- .../cassandra/tools/SSTableImportTest.java | 51 ------- 12 files changed, 76 insertions(+), 271 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cf74bcfc/NEWS.txt ----------------------------------------------------------------------