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 E149AD168 for ; Tue, 15 Jan 2013 15:10:35 +0000 (UTC) Received: (qmail 48458 invoked by uid 500); 15 Jan 2013 15:10:35 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 48374 invoked by uid 500); 15 Jan 2013 15:10: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 48328 invoked by uid 99); 15 Jan 2013 15:10:34 -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, 15 Jan 2013 15:10:34 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 682031DBE2; Tue, 15 Jan 2013 15:10:34 +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: [3/3] git commit: Merge branch 'cassandra-1.2' into trunk Message-Id: <20130115151034.682031DBE2@tyr.zones.apache.org> Date: Tue, 15 Jan 2013 15:10:34 +0000 (UTC) Updated Branches: refs/heads/cassandra-1.2 e90dcd51d -> 79764f743 refs/heads/trunk 7c77c8415 -> 4bab13ec4 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4bab13ec Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4bab13ec Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4bab13ec Branch: refs/heads/trunk Commit: 4bab13ec4a036ce92c30778043f3a2391148150c Parents: 7c77c84 79764f7 Author: Brandon Williams Authored: Tue Jan 15 09:10:37 2013 -0600 Committer: Brandon Williams Committed: Tue Jan 15 09:10:37 2013 -0600 ---------------------------------------------------------------------- .../org/apache/cassandra/db/ColumnFamilyStore.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4bab13ec/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------