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 C2EC69CEF for ; Mon, 27 Feb 2012 17:04:57 +0000 (UTC) Received: (qmail 69034 invoked by uid 500); 27 Feb 2012 17:04:57 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 69001 invoked by uid 500); 27 Feb 2012 17:04:57 -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 68992 invoked by uid 99); 27 Feb 2012 17:04:57 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Feb 2012 17:04:57 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.114] (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Feb 2012 17:04:56 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id AFCE28134F6; Mon, 27 Feb 2012 17:04:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: xedin@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [1/3] git commit: merge from 1.1 Message-Id: <20120227170436.AFCE28134F6@tyr.zones.apache.org> Date: Mon, 27 Feb 2012 17:04:36 +0000 (UTC) Updated Branches: refs/heads/trunk 8e371d82d -> c971e4c7f merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c971e4c7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c971e4c7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c971e4c7 Branch: refs/heads/trunk Commit: c971e4c7f0c94c8f65882e2499c7e41d9f37387e Parents: 8e371d8 e45bdb8 Author: Pavel Yaskevich Authored: Mon Feb 27 20:02:32 2012 +0300 Committer: Pavel Yaskevich Committed: Mon Feb 27 20:02:32 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/config/CFMetaData.java | 6 ++++++ .../apache/cassandra/config/ColumnDefinition.java | 6 ++++++ .../org/apache/cassandra/config/KSMetaData.java | 12 ++++++++++++ 4 files changed, 25 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c971e4c7/src/java/org/apache/cassandra/config/CFMetaData.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c971e4c7/src/java/org/apache/cassandra/config/ColumnDefinition.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c971e4c7/src/java/org/apache/cassandra/config/KSMetaData.java ----------------------------------------------------------------------