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 7321EF306 for ; Tue, 19 Mar 2013 20:51:08 +0000 (UTC) Received: (qmail 78441 invoked by uid 500); 19 Mar 2013 20:51:07 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 78388 invoked by uid 500); 19 Mar 2013 20:51:07 -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 78324 invoked by uid 99); 19 Mar 2013 20:51:07 -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, 19 Mar 2013 20:51:07 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9849D39E8C; Tue, 19 Mar 2013 20:51:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brandonwilliams@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [5/5] git commit: Merge branch 'cassandra-1.2' into trunk Message-Id: <20130319205107.9849D39E8C@tyr.zones.apache.org> Date: Tue, 19 Mar 2013 20:51:07 +0000 (UTC) Updated Branches: refs/heads/cassandra-1.2 6a7a28852 -> 1fc218ff7 refs/heads/trunk f8fd16922 -> bcabea730 Merge branch 'cassandra-1.2' into trunk Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bcabea73 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bcabea73 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bcabea73 Branch: refs/heads/trunk Commit: bcabea7307c3d76d35a66a23b13ee40c8d90c015 Parents: f8fd169 1fc218f Author: Brandon Williams Authored: Tue Mar 19 15:50:44 2013 -0500 Committer: Brandon Williams Committed: Tue Mar 19 15:50:44 2013 -0500 ---------------------------------------------------------------------- .../cassandra/db/commitlog/CommitLogSegment.java | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bcabea73/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java ----------------------------------------------------------------------