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 933E5D3E0 for ; Fri, 7 Dec 2012 22:56:16 +0000 (UTC) Received: (qmail 49409 invoked by uid 500); 7 Dec 2012 22:56:14 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 49318 invoked by uid 500); 7 Dec 2012 22:56:14 -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 48875 invoked by uid 99); 7 Dec 2012 22:56:13 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Dec 2012 22:56:13 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3DF3431D844; Fri, 7 Dec 2012 22:56:13 +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: [12/16] git commit: add #2474, #4434 to CHANGES Message-Id: <20121207225613.3DF3431D844@tyr.zones.apache.org> Date: Fri, 7 Dec 2012 22:56:13 +0000 (UTC) add #2474, #4434 to CHANGES Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f618369f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f618369f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f618369f Branch: refs/heads/trunk Commit: f618369f392af6927adc587ebfbeb595925fe138 Parents: c9ce1f0 Author: Jonathan Ellis Authored: Fri Dec 7 16:52:54 2012 -0600 Committer: Jonathan Ellis Committed: Fri Dec 7 16:52:58 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f618369f/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 5d1fd8d..874dbd4 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -113,6 +113,7 @@ Merged from 1.0: 1.1.3 + * (cqlsh) add COPY TO (CASSANDRA-4434) * munmap commitlog segments before rename (CASSANDRA-4337) * (JMX) rename getRangeKeySample to sampleKeyRange to avoid returning multi-MB results as an attribute (CASSANDRA-4452) @@ -454,7 +455,7 @@ Merged from 0.8: * Add SnapshotCommand to trigger snapshot on remote node (CASSANDRA-3721) * Make CFMetaData conversions to/from thrift/native schema inverses (CASSANDRA_3559) - * Add initial code for CQL 3.0-beta (CASSANDRA-3781, 3753) + * Add initial code for CQL 3.0-beta (CASSANDRA-2474, 3781, 3753) * Add wide row support for ColumnFamilyInputFormat (CASSANDRA-3264) * Allow extending CompositeType comparator (CASSANDRA-3657) * Avoids over-paging during get_count (CASSANDRA-3798)