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/1c1a40e1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1c1a40e1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1c1a40e1 Branch: refs/heads/trunk Commit: 1c1a40e10bc634e8edfd2b8aa50f90ff416c2c2f Parents: 077d3ce 1c3de27 Author: Mikhail Stepura <[email protected]> Authored: Mon Aug 4 14:35:06 2014 -0700 Committer: Mikhail Stepura <[email protected]> Committed: Mon Aug 4 14:35:06 2014 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh | 1 + 2 files changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1c1a40e1/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 86ff4b1,b0b5166..d7ed9a5 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,20 -1,5 +1,21 @@@ +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) Merged from 2.0: * Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669) http://git-wip-us.apache.org/repos/asf/cassandra/blob/1c1a40e1/bin/cqlsh ----------------------------------------------------------------------
