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 2E3B8108EC for ; Mon, 21 Oct 2013 16:28:27 +0000 (UTC) Received: (qmail 73370 invoked by uid 500); 21 Oct 2013 16:28:26 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 73184 invoked by uid 500); 21 Oct 2013 16:28:26 -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 73047 invoked by uid 99); 21 Oct 2013 16:28:25 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Oct 2013 16:28:25 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9FBD34EED0; Mon, 21 Oct 2013 16:28:25 +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: Mon, 21 Oct 2013 16:28:27 -0000 Message-Id: <5df2f1e73f534c04a6a79b407579d59c@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Merge branch 'cassandra-2.0' into trunk Merge branch 'cassandra-2.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/35cbc198 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/35cbc198 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/35cbc198 Branch: refs/heads/trunk Commit: 35cbc19800b1bf2c14394402b5d670745bb666e2 Parents: 9957ed6 0c5f05b Author: Aleksey Yeschenko Authored: Tue Oct 22 00:28:16 2013 +0800 Committer: Aleksey Yeschenko Committed: Tue Oct 22 00:28:16 2013 +0800 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/BatchlogManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------