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 7793EC376 for ; Thu, 7 Aug 2014 14:28:02 +0000 (UTC) Received: (qmail 63027 invoked by uid 500); 7 Aug 2014 14:28:01 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 62953 invoked by uid 500); 7 Aug 2014 14:28:01 -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 62706 invoked by uid 99); 7 Aug 2014 14:28:01 -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, 07 Aug 2014 14:28:01 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 32ABC9C2768; Thu, 7 Aug 2014 14:28:01 +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, 07 Aug 2014 14:28:07 -0000 Message-Id: <36b17215323444d181a0e4861eaf9f08@git.apache.org> In-Reply-To: <26ab605452d2445f92a3ef0708aab906@git.apache.org> References: <26ab605452d2445f92a3ef0708aab906@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [7/9] 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/f95b40c1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f95b40c1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f95b40c1 Branch: refs/heads/trunk Commit: f95b40c1de385108b47e5aa32c0057c120e2ac03 Parents: 17055bf 24d8571 Author: Jonathan Ellis Authored: Thu Aug 7 09:25:25 2014 -0500 Committer: Jonathan Ellis Committed: Thu Aug 7 09:25:25 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../DebuggableThreadPoolExecutor.java | 8 +- .../db/compaction/CompactionManager.java | 4 +- .../apache/cassandra/tools/SSTableExport.java | 131 +++++++++++-------- 4 files changed, 83 insertions(+), 62 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f95b40c1/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f95b40c1/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f95b40c1/src/java/org/apache/cassandra/tools/SSTableExport.java ----------------------------------------------------------------------