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 5B4C91889F for ; Fri, 13 Nov 2015 15:04:03 +0000 (UTC) Received: (qmail 49608 invoked by uid 500); 13 Nov 2015 15:04:02 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 49545 invoked by uid 500); 13 Nov 2015 15:04:02 -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 49172 invoked by uid 99); 13 Nov 2015 15:04:02 -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, 13 Nov 2015 15:04:02 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 81D5BE041F; Fri, 13 Nov 2015 15:04:02 +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: Fri, 13 Nov 2015 15:04:06 -0000 Message-Id: In-Reply-To: <9e8a097a59c84a31b8c3ba5e3a1338f8@git.apache.org> References: <9e8a097a59c84a31b8c3ba5e3a1338f8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1 Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/88892af9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/88892af9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/88892af9 Branch: refs/heads/cassandra-3.1 Commit: 88892af934af23fa15571e165c79446d3ef1bd43 Parents: f92f69c 3223927 Author: Joshua McKenzie Authored: Fri Nov 13 10:03:45 2015 -0500 Committer: Joshua McKenzie Committed: Fri Nov 13 10:03:45 2015 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/lifecycle/LogFile.java | 7 ++++--- .../org/apache/cassandra/db/lifecycle/LogTransaction.java | 6 ++---- 2 files changed, 6 insertions(+), 7 deletions(-) ----------------------------------------------------------------------