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 D7C4E18DDD for ; Sat, 8 Aug 2015 10:37:06 +0000 (UTC) Received: (qmail 2311 invoked by uid 500); 8 Aug 2015 10:37:05 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 2207 invoked by uid 500); 8 Aug 2015 10:37:05 -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 1537 invoked by uid 99); 8 Aug 2015 10:37:05 -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; Sat, 08 Aug 2015 10:37:05 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B55B3E113B; Sat, 8 Aug 2015 10:37:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: benedict@apache.org To: commits@cassandra.apache.org Date: Sat, 08 Aug 2015 10:37:13 -0000 Message-Id: <72a60381de454cc6a9850dc4f1b2a923@git.apache.org> In-Reply-To: <211d8c994abb41c29a692a89d91a1ec6@git.apache.org> References: <211d8c994abb41c29a692a89d91a1ec6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/10] 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/6292aaa7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6292aaa7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6292aaa7 Branch: refs/heads/trunk Commit: 6292aaa729ffb7f6367b149fb84edce3613c7872 Parents: 05de664 7ea2ce1 Author: Benedict Elliott Smith Authored: Sat Aug 8 12:36:36 2015 +0200 Committer: Benedict Elliott Smith Committed: Sat Aug 8 12:36:36 2015 +0200 ---------------------------------------------------------------------- .../apache/cassandra/db/commitlog/AbstractCommitLogService.java | 3 ++- .../org/apache/cassandra/db/commitlog/BatchCommitLogService.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) ----------------------------------------------------------------------