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 28BC7104A2 for ; Thu, 22 Aug 2013 08:19:07 +0000 (UTC) Received: (qmail 61005 invoked by uid 500); 22 Aug 2013 08:19:06 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 60418 invoked by uid 500); 22 Aug 2013 08:19: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 60181 invoked by uid 99); 22 Aug 2013 08:19:04 -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, 22 Aug 2013 08:19:04 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 384C88C2922; Thu, 22 Aug 2013 08:19:04 +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 Date: Thu, 22 Aug 2013 08:19:07 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/5] 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/8bc0f599 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8bc0f599 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8bc0f599 Branch: refs/heads/trunk Commit: 8bc0f59904a25aee72168104a88596419b3e9b2e Parents: d24e900 05929c0 Author: Sylvain Lebresne Authored: Thu Aug 22 10:18:51 2013 +0200 Committer: Sylvain Lebresne Committed: Thu Aug 22 10:18:51 2013 +0200 ---------------------------------------------------------------------- CHANGES.txt | 2 + NEWS.txt | 1 + bin/sstablesplit | 50 ++++ debian/cassandra.install | 1 + .../cassandra/db/compaction/CompactionTask.java | 14 +- .../db/compaction/SSTableSplitter.java | 105 ++++++++ .../cassandra/tools/StandaloneSplitter.java | 256 +++++++++++++++++++ 7 files changed, 427 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8bc0f599/CHANGES.txt ----------------------------------------------------------------------