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 55B8B181EC for ; Fri, 18 Dec 2015 23:39:53 +0000 (UTC) Received: (qmail 3568 invoked by uid 500); 18 Dec 2015 23:39:53 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 3498 invoked by uid 500); 18 Dec 2015 23:39:53 -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 3288 invoked by uid 99); 18 Dec 2015 23:39:52 -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, 18 Dec 2015 23:39:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C3827E0941; Fri, 18 Dec 2015 23:39:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aleksey@apache.org To: commits@cassandra.apache.org Date: Fri, 18 Dec 2015 23:39:54 -0000 Message-Id: <6d0f6e6b184948dabd64c10bac7912a0@git.apache.org> In-Reply-To: <3cc16e2c3cb542e1bd29267a870a87cb@git.apache.org> References: <3cc16e2c3cb542e1bd29267a870a87cb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/4] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0 Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d5326d4a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d5326d4a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d5326d4a Branch: refs/heads/trunk Commit: d5326d4aa5d1d89d36c0600508323ccf8fa109da Parents: 2800bf1 c26b397 Author: Aleksey Yeschenko Authored: Fri Dec 18 23:39:09 2015 +0000 Committer: Aleksey Yeschenko Committed: Fri Dec 18 23:39:09 2015 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/commitlog/CommitLogArchiver.java | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d5326d4a/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d5326d4a/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java ----------------------------------------------------------------------