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 DC49B11E27 for ; Wed, 6 Aug 2014 18:34:25 +0000 (UTC) Received: (qmail 66478 invoked by uid 500); 6 Aug 2014 18:34:15 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 66416 invoked by uid 500); 6 Aug 2014 18:34:15 -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 66314 invoked by uid 99); 6 Aug 2014 18:34:15 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Aug 2014 18:34:15 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6BAAB924AE1; Wed, 6 Aug 2014 18:34:15 +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 Date: Wed, 06 Aug 2014 18:34:17 -0000 Message-Id: In-Reply-To: <7f2ffeae9bde41d6a6dfe9085e2df1b1@git.apache.org> References: <7f2ffeae9bde41d6a6dfe9085e2df1b1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/6] git commit: fix CHANGES fix CHANGES Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a633156b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a633156b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a633156b Branch: refs/heads/trunk Commit: a633156bf25222197837c5c3c43a269a42913d7d Parents: d9b7d44 Author: Jonathan Ellis Authored: Wed Aug 6 13:33:19 2014 -0500 Committer: Jonathan Ellis Committed: Wed Aug 6 13:33:19 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a633156b/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 78abb47..e1783b5 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -8,12 +8,9 @@ * Fix UDT field selection with empty fields (CASSANDRA-7670) * Bogus deserialization of static cells from sstable (CASSANDRA-7684) Merged from 2.0: - * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635) * Add cassandra.auto_bootstrap system property (CASSANDRA-7650) - * Remove CqlPagingRecordReader/CqlPagingInputFormat (CASSANDRA-7570) - * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229) - * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635) * Update java driver (for hadoop) (CASSANDRA-7618) + * Remove CqlPagingRecordReader/CqlPagingInputFormat (CASSANDRA-7570) * Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)