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 3A16F200B34 for ; Fri, 27 May 2016 19:38:33 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 38A91160A10; Fri, 27 May 2016 17:38:33 +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 6B3C0160A37 for ; Fri, 27 May 2016 19:38:32 +0200 (CEST) Received: (qmail 99260 invoked by uid 500); 27 May 2016 17:38:31 -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 99011 invoked by uid 99); 27 May 2016 17:38:31 -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; Fri, 27 May 2016 17:38:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 44675E0459; Fri, 27 May 2016 17:38:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tylerhobbs@apache.org To: commits@cassandra.apache.org Date: Fri, 27 May 2016 17:38:33 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] cassandra git commit: Merge branch 'cassandra-3.7' into trunk archived-at: Fri, 27 May 2016 17:38:33 -0000 Merge branch 'cassandra-3.7' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5ca8052a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5ca8052a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5ca8052a Branch: refs/heads/trunk Commit: 5ca8052a9cb6aaf350c25c340bf03069a846f443 Parents: 89f275c a2dd005 Author: Tyler Hobbs Authored: Fri May 27 12:38:14 2016 -0500 Committer: Tyler Hobbs Committed: Fri May 27 12:38:14 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../io/sstable/format/SSTableReader.java | 71 +------------------- 2 files changed, 3 insertions(+), 70 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5ca8052a/CHANGES.txt ----------------------------------------------------------------------