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 E17B117597 for ; Tue, 3 Mar 2015 23:15:35 +0000 (UTC) Received: (qmail 23037 invoked by uid 500); 3 Mar 2015 23:15:35 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 22877 invoked by uid 500); 3 Mar 2015 23:15:35 -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 22772 invoked by uid 99); 3 Mar 2015 23:15:35 -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; Tue, 03 Mar 2015 23:15:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 66615E0FB8; Tue, 3 Mar 2015 23:15:35 +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: Tue, 03 Mar 2015 23:15:37 -0000 Message-Id: <09c2d0084af74648897203d72cc8c351@git.apache.org> In-Reply-To: <0baea42cb8a646c0973f2f02e480afc0@git.apache.org> References: <0baea42cb8a646c0973f2f02e480afc0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] cassandra 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/56348ea7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56348ea7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/56348ea7 Branch: refs/heads/trunk Commit: 56348ea7b7011d3d203d9dfaa0f5f32752771a86 Parents: 787a20f 2acd05d Author: Aleksey Yeschenko Authored: Tue Mar 3 15:15:29 2015 -0800 Committer: Aleksey Yeschenko Committed: Tue Mar 3 15:15:29 2015 -0800 ---------------------------------------------------------------------- conf/commitlog_archiving.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------