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 C19D617434 for ; Tue, 30 Sep 2014 19:11:18 +0000 (UTC) Received: (qmail 85512 invoked by uid 500); 30 Sep 2014 19:11:18 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 85308 invoked by uid 500); 30 Sep 2014 19:11:17 -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 84666 invoked by uid 99); 30 Sep 2014 19:11:17 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Sep 2014 19:11:17 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6C921A04F80; Tue, 30 Sep 2014 19:11:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org Date: Tue, 30 Sep 2014 19:11:22 -0000 Message-Id: <9f546feecc2c43be81fbbf30b8e2afe2@git.apache.org> In-Reply-To: <8798cb551c6747f4a0096eb9c289cd00@git.apache.org> References: <8798cb551c6747f4a0096eb9c289cd00@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/6] git commit: Merge branch 'cassandra-2.1' into trunk Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6b849da2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6b849da2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6b849da2 Branch: refs/heads/trunk Commit: 6b849da26df6bd1e99f6379a814691d43a2d6d0c Parents: c5c3ee9 1394b12 Author: Jonathan Ellis Authored: Tue Sep 30 14:11:09 2014 -0500 Committer: Jonathan Ellis Committed: Tue Sep 30 14:11:09 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/db/commitlog/CommitLog.java | 17 +++++++++--- .../db/commitlog/CommitLogArchiver.java | 28 +++++++++++++++++++- 3 files changed, 41 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b849da2/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b849da2/src/java/org/apache/cassandra/db/commitlog/CommitLog.java ----------------------------------------------------------------------