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/d585592c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d585592c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d585592c Branch: refs/heads/trunk Commit: d585592c70d9b38e18d15fb7f77c195526bf3808 Parents: 5009ee3 9415bb4 Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Aug 4 12:05:33 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Aug 4 12:05:33 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 11 +++++++++++ src/java/org/apache/cassandra/tools/NodeProbe.java | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d585592c/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 6ba5e7a,48140fd..92f077e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,19 -1,7 +1,22 @@@ +2.1.1 + * 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 + Merged from 2.0: + * Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669) + 2.1.0-rc5 * Reject counters inside user types (CASSANDRA-7672)
