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 009AC11C60 for ; Wed, 6 Aug 2014 18:10:46 +0000 (UTC) Received: (qmail 78292 invoked by uid 500); 6 Aug 2014 18:10:45 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 78163 invoked by uid 500); 6 Aug 2014 18:10:45 -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 77850 invoked by uid 99); 6 Aug 2014 18:10:45 -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:10:45 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3F0129247CF; Wed, 6 Aug 2014 18:10:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brandonwilliams@apache.org To: commits@cassandra.apache.org Date: Wed, 06 Aug 2014 18:10:48 -0000 Message-Id: <6f776ce6f74e495296c135817e9eb7fc@git.apache.org> In-Reply-To: <2b4d0a83fcfb48f6a6c928c318fb8de0@git.apache.org> References: <2b4d0a83fcfb48f6a6c928c318fb8de0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/6] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1 Merge branch 'cassandra-2.1.0' into cassandra-2.1 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fa388ecb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fa388ecb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fa388ecb Branch: refs/heads/trunk Commit: fa388ecbc3eddf8103ddac6e4f73a41abbc1a7a8 Parents: 304260d 1993702 Author: Brandon Williams Authored: Wed Aug 6 13:10:27 2014 -0500 Committer: Brandon Williams Committed: Wed Aug 6 13:10:27 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fa388ecb/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index eb3485a,e15a749..4bf17a2 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -24,10 -3,14 +24,9 @@@ Merged from 2.0 * Fix binding null values inside UDT (CASSANDRA-7685) * Fix UDT field selection with empty fields (CASSANDRA-7670) * Bogus deserialization of static cells from sstable (CASSANDRA-7684) - * cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687) - * Fix binding null values inside UDT (CASSANDRA-7685) - * Fix UDT field selection with empty fields (CASSANDRA-7670) - * Bogus deserialization of static cells from sstable (CASSANDRA-7684) - * Add stop method to EmbeddedCassandraService (CASSANDRA-7595) Merged from 2.0: - * Remove CqlPagingRecordReader/CqlPagingInputFormat (CASSANDRA-7570) - * Add stop method to EmbeddedCassandraService (CASSANDRA-7595) * Update java driver (for hadoop) (CASSANDRA-7618) + * Remove CqlPagingRecordReader/CqlPagingInputFormat (CASSANDRA-7570) * Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)