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 E21C018A51 for ; Tue, 4 Aug 2015 07:57:33 +0000 (UTC) Received: (qmail 73690 invoked by uid 500); 4 Aug 2015 07:57:33 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 73560 invoked by uid 500); 4 Aug 2015 07:57:33 -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 73545 invoked by uid 99); 4 Aug 2015 07:57:33 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Aug 2015 07:57:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5EC69E0F7C; Tue, 4 Aug 2015 07:57:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: marcuse@apache.org To: commits@cassandra.apache.org Date: Tue, 04 Aug 2015 07:57:34 -0000 Message-Id: <8b92dd8d0ef042baa0b4ba214e4d3a3a@git.apache.org> In-Reply-To: <45b6979c523e420aa683e3e495007c3d@git.apache.org> References: <45b6979c523e420aa683e3e495007c3d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2 Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5c59d5af Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5c59d5af Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5c59d5af Branch: refs/heads/cassandra-2.2 Commit: 5c59d5af751058ed86b63db05d5a17c48f4dfa41 Parents: 5a54d9a 1a2c1bc Author: Marcus Eriksson Authored: Tue Aug 4 09:52:11 2015 +0200 Committer: Marcus Eriksson Committed: Tue Aug 4 09:52:11 2015 +0200 ---------------------------------------------------------------------- .../db/compaction/CompactionsCQLTest.java | 118 ++++++++++++++++++- 1 file changed, 113 insertions(+), 5 deletions(-) ----------------------------------------------------------------------