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 791699D87 for ; Wed, 29 Feb 2012 18:28:20 +0000 (UTC) Received: (qmail 43388 invoked by uid 500); 29 Feb 2012 18:28:20 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 43355 invoked by uid 500); 29 Feb 2012 18:28:20 -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 43347 invoked by uid 99); 29 Feb 2012 18:28:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Feb 2012 18:28:20 +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; Wed, 29 Feb 2012 18:28:19 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1A7C44D123; Wed, 29 Feb 2012 18:27:59 +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.0 Message-Id: <20120229182759.1A7C44D123@tyr.zones.apache.org> Date: Wed, 29 Feb 2012 18:27:59 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Updated Branches: refs/heads/cassandra-1.1 49e134c73 -> 32f5d0641 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/32f5d064 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/32f5d064 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/32f5d064 Branch: refs/heads/cassandra-1.1 Commit: 32f5d06411a88a2cdb20408457a136ed9121d110 Parents: 49e134c 0447837 Author: Pavel Yaskevich Authored: Wed Feb 29 21:26:28 2012 +0300 Committer: Pavel Yaskevich Committed: Wed Feb 29 21:26:28 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/cli/CliHelp.yaml | 12 ++++++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f5d064/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 7960679,8350252..c0f4b17 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -30,9 -25,9 +30,10 @@@ Merged from 1.0 * always compact away deleted hints immediately after handoff (CASSANDRA-3955) * delete hints from dropped ColumnFamilies on handoff instead of erroring out (CASSANDRA-3975) + * add CompositeType ref to the CLI doc for create/update column family (CASSANDRA-3980) + 1.1-beta1 * add nodetool rebuild_index (CASSANDRA-3583) * add nodetool rangekeysample (CASSANDRA-2917) http://git-wip-us.apache.org/repos/asf/cassandra/blob/32f5d064/src/resources/org/apache/cassandra/cli/CliHelp.yaml ----------------------------------------------------------------------