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 7AD689C60 for ; Sat, 26 May 2012 05:25:52 +0000 (UTC) Received: (qmail 83817 invoked by uid 500); 26 May 2012 05:25:50 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 83664 invoked by uid 500); 26 May 2012 05:25:50 -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 83197 invoked by uid 99); 26 May 2012 05:25:46 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 26 May 2012 05:25:46 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3928218226; Sat, 26 May 2012 05:25:45 +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 X-Mailer: ASF-Git Admin Mailer Subject: [3/22] git commit: Merge branch 'cassandra-1.0' into cassandra-1.1 Message-Id: <20120526052545.3928218226@tyr.zones.apache.org> Date: Sat, 26 May 2012 05:25:45 +0000 (UTC) Merge branch 'cassandra-1.0' into cassandra-1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dad8d80f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dad8d80f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dad8d80f Branch: refs/heads/trunk Commit: dad8d80fe5b48c56215dcc596866f8610909dfa8 Parents: 64a5e70 043d180 Author: Jonathan Ellis Authored: Sat May 26 00:23:17 2012 -0500 Committer: Jonathan Ellis Committed: Sat May 26 00:23:17 2012 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/db/ColumnFamilyStore.java | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dad8d80f/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------