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 2A08418B3B for ; Tue, 25 Aug 2015 16:21:29 +0000 (UTC) Received: (qmail 89972 invoked by uid 500); 25 Aug 2015 16:21:29 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 89945 invoked by uid 500); 25 Aug 2015 16:21:29 -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 89932 invoked by uid 99); 25 Aug 2015 16:21:28 -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, 25 Aug 2015 16:21:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 88F38E01F4; Tue, 25 Aug 2015 16:21:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jmckenzie@apache.org To: commits@cassandra.apache.org Date: Tue, 25 Aug 2015 16:21:29 -0000 Message-Id: <58d877acecb342f6af97042bfd9ac712@git.apache.org> In-Reply-To: <42757ac44f6c4c06aa628045f6e74ec0@git.apache.org> References: <42757ac44f6c4c06aa628045f6e74ec0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk Merge branch 'cassandra-3.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/34910c5a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/34910c5a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/34910c5a Branch: refs/heads/trunk Commit: 34910c5a3a5ee94681f932afcc95ea39e2ed8315 Parents: f90a611 8afc76a Author: Joshua McKenzie Authored: Tue Aug 25 12:20:40 2015 -0400 Committer: Joshua McKenzie Committed: Tue Aug 25 12:20:40 2015 -0400 ---------------------------------------------------------------------- .../cassandra/io/sstable/SSTableLoaderTest.java | 39 ++++++++++++++++++-- 1 file changed, 36 insertions(+), 3 deletions(-) ----------------------------------------------------------------------