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 1699C192D6 for ; Mon, 11 Apr 2016 07:45:14 +0000 (UTC) Received: (qmail 76641 invoked by uid 500); 11 Apr 2016 07:45:13 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 76563 invoked by uid 500); 11 Apr 2016 07:45:13 -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 76415 invoked by uid 99); 11 Apr 2016 07:45:13 -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; Mon, 11 Apr 2016 07:45:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8000DDFC6F; Mon, 11 Apr 2016 07:45:13 +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: Mon, 11 Apr 2016 07:45:14 -0000 Message-Id: In-Reply-To: <43d44009434847669909913a82752d1a@git.apache.org> References: <43d44009434847669909913a82752d1a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] cassandra git commit: Merge branch cassandra-2.1 into cassandra-2.2 Merge branch cassandra-2.1 into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e22faeb8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e22faeb8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e22faeb8 Branch: refs/heads/cassandra-2.2 Commit: e22faeb8c5463a34b630aff8e265aefbe950b58d Parents: 96c53e0 2dd244b Author: Benjamin Lerer Authored: Mon Apr 11 09:43:56 2016 +0200 Committer: Benjamin Lerer Committed: Mon Apr 11 09:44:08 2016 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/commitlog/CommitLog.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e22faeb8/src/java/org/apache/cassandra/db/commitlog/CommitLog.java ----------------------------------------------------------------------