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 3F46C10B1E for ; Tue, 5 Aug 2014 08:38:16 +0000 (UTC) Received: (qmail 92748 invoked by uid 500); 5 Aug 2014 08:38:16 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 92633 invoked by uid 500); 5 Aug 2014 08:38: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 92606 invoked by uid 99); 5 Aug 2014 08:38: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; Tue, 05 Aug 2014 08:38:15 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A4CBE9BF0F7; Tue, 5 Aug 2014 08:38:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: slebresne@apache.org To: commits@cassandra.apache.org Date: Tue, 05 Aug 2014 08:38:16 -0000 Message-Id: <6e453e80944c422e9df0e6187ed7874a@git.apache.org> In-Reply-To: <39e625fbf5c44105bea3e6866019e597@git.apache.org> References: <39e625fbf5c44105bea3e6866019e597@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1 Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8a3fc029 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8a3fc029 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8a3fc029 Branch: refs/heads/cassandra-2.1 Commit: 8a3fc0292723038e0af54944c0679c51a500befe Parents: e6602f7 a3d8375a Author: Sylvain Lebresne Authored: Tue Aug 5 10:38:07 2014 +0200 Committer: Sylvain Lebresne Committed: Tue Aug 5 10:38:07 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/UserTypes.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a3fc029/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 590c2fe,98a0246..3588553 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,21 -1,6 +1,22 @@@ +2.1.1 + * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689) + * Add support for custom 2i validation (CASSANDRA-7575) + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Add listen_interface and rpc_interface options (CASSANDRA-7417) + * Improve schema merge performance (CASSANDRA-7444) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + * Configurable client timeout for cqlsh (CASSANDRA-7516) + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111) +Merged from 2.0: + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611) + * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345) + * cqlsh fails when version number parts are not int (CASSANDRA-7524) + + 2.1.0-final * cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687) + * Fix binding null values inside UDT (CASSANDRA-7685) Merged from 2.0: * Update java driver (for hadoop) (CASSANDRA-7618) * Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)