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 A5D0E9B4A for ; Mon, 27 Feb 2012 17:02:25 +0000 (UTC) Received: (qmail 59915 invoked by uid 500); 27 Feb 2012 17:02:25 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 59892 invoked by uid 500); 27 Feb 2012 17:02:25 -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 59884 invoked by uid 99); 27 Feb 2012 17:02:25 -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:02:25 +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:02:24 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 89AA08134D0; Mon, 27 Feb 2012 17:02:04 +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/2] git commit: merge from 1.1.0 Message-Id: <20120227170204.89AA08134D0@tyr.zones.apache.org> Date: Mon, 27 Feb 2012 17:02:04 +0000 (UTC) Updated Branches: refs/heads/cassandra-1.1 5f43a6950 -> e45bdb8b6 merge from 1.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e45bdb8b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e45bdb8b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e45bdb8b Branch: refs/heads/cassandra-1.1 Commit: e45bdb8b66588277f208681f9b6aa663fccaeb96 Parents: 5f43a69 b2b8a53 Author: Pavel Yaskevich Authored: Mon Feb 27 20:01:03 2012 +0300 Committer: Pavel Yaskevich Committed: Mon Feb 27 20:01:03 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/e45bdb8b/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index c8ccc24,cd05765..2cc8c52 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -10,7 -9,7 +10,8 @@@ * Remove deprecated merge_shard_chance (CASSANDRA-3940) * add a convenient way to reset a node's schema (CASSANDRA-2963) * fix for intermittent SchemaDisagreementException (CASSANDRA-3884) + * CLI `list ` to limit number of columns and their order (CASSANDRA-3012) + * ignore deprecated KsDef/CfDef/ColumnDef fields in native schema (CASSANDRA-3963) Merged from 1.0: * remove the wait on hint future during write (CASSANDRA-3870) * (cqlsh) ignore missing CfDef opts (CASSANDRA-3933) http://git-wip-us.apache.org/repos/asf/cassandra/blob/e45bdb8b/src/java/org/apache/cassandra/config/KSMetaData.java ----------------------------------------------------------------------