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 1F410200AE2 for ; Fri, 27 May 2016 11:11:52 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 1DDE816099F; Fri, 27 May 2016 09:11:52 +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 7F383160A38 for ; Fri, 27 May 2016 11:11:51 +0200 (CEST) Received: (qmail 32965 invoked by uid 500); 27 May 2016 09:11:50 -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 32663 invoked by uid 99); 27 May 2016 09:11:50 -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 09:11:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1A6B8E0BAA; Fri, 27 May 2016 09:11:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: blerer@apache.org To: commits@cassandra.apache.org Date: Fri, 27 May 2016 09:11:53 -0000 Message-Id: In-Reply-To: <179f046781aa4d1983db22b1dc608357@git.apache.org> References: <179f046781aa4d1983db22b1dc608357@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/4] cassandra git commit: Merge branch cassandra-3.7 into trunk archived-at: Fri, 27 May 2016 09:11:52 -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/d9b192e3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d9b192e3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d9b192e3 Branch: refs/heads/trunk Commit: d9b192e33a746fd30b635548719a2ecfdae6d4a1 Parents: 4927848 867a490 Author: Benjamin Lerer Authored: Fri May 27 11:10:52 2016 +0200 Committer: Benjamin Lerer Committed: Fri May 27 11:11:02 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/commitlog/CommitLog.java | 8 ++------ .../cassandra/db/commitlog/CommitLogSegment.java | 16 +++++++++++++++- 3 files changed, 18 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d9b192e3/CHANGES.txt ----------------------------------------------------------------------