Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 99F5F200BC7 for ; Thu, 10 Nov 2016 11:11:02 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 98851160B01; Thu, 10 Nov 2016 10:11:02 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id DF1CD160B11 for ; Thu, 10 Nov 2016 11:11:01 +0100 (CET) Received: (qmail 25563 invoked by uid 500); 10 Nov 2016 10:11:00 -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 25321 invoked by uid 99); 10 Nov 2016 10:11:00 -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; Thu, 10 Nov 2016 10:11:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 848ADEEE3E; Thu, 10 Nov 2016 10:10:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: samt@apache.org To: commits@cassandra.apache.org Date: Thu, 10 Nov 2016 10:11:07 -0000 Message-Id: <5f967750f2864d45a59177dae30fa3e3@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [09/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.X archived-at: Thu, 10 Nov 2016 10:11:02 -0000 Merge branch 'cassandra-3.0' into cassandra-3.X Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/90eed50c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/90eed50c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/90eed50c Branch: refs/heads/trunk Commit: 90eed50c956dafd27946963d91315b683a99fab6 Parents: 072b527 bfa8c80 Author: Sam Tunnicliffe Authored: Thu Nov 10 10:08:10 2016 +0000 Committer: Sam Tunnicliffe Committed: Thu Nov 10 10:08:10 2016 +0000 ---------------------------------------------------------------------- .../io/sstable/IndexSummaryManagerTest.java | 68 ++++++++++---------- 1 file changed, 35 insertions(+), 33 deletions(-) ----------------------------------------------------------------------