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 8B778D022 for ; Tue, 25 Sep 2012 21:51:07 +0000 (UTC) Received: (qmail 64861 invoked by uid 500); 25 Sep 2012 21:51:07 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 64838 invoked by uid 500); 25 Sep 2012 21: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 64829 invoked by uid 99); 25 Sep 2012 21: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, 25 Sep 2012 21:51:07 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1A1B83B7DB; Tue, 25 Sep 2012 21:51:06 +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: [1/3] git commit: Merge branch 'cassandra-1.1' into trunk Message-Id: <20120925215107.1A1B83B7DB@tyr.zones.apache.org> Date: Tue, 25 Sep 2012 21:51:06 +0000 (UTC) Updated Branches: refs/heads/cassandra-1.1 b961986a7 -> 05a5ede91 refs/heads/trunk 5c1612017 -> 7dee84c34 Merge branch 'cassandra-1.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/7dee84c3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7dee84c3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7dee84c3 Branch: refs/heads/trunk Commit: 7dee84c34e98e4c6cc5b8d14dbe1247245679653 Parents: 5c16120 05a5ede Author: Jonathan Ellis Authored: Tue Sep 25 16:50:36 2012 -0500 Committer: Jonathan Ellis Committed: Tue Sep 25 16:50:36 2012 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/config/CFMetaData.java | 4 ++-- .../org/apache/cassandra/config/KSMetaData.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7dee84c3/src/java/org/apache/cassandra/config/CFMetaData.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7dee84c3/src/java/org/apache/cassandra/config/KSMetaData.java ----------------------------------------------------------------------