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/8b5990ae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8b5990ae Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8b5990ae Branch: refs/heads/cassandra-2.1 Commit: 8b5990ae99697aa265e1c6664e436cb44f65756f Parents: 5f0413b c46477b Author: Tyler Hobbs <ty...@datastax.com> Authored: Fri Aug 1 10:36:46 2014 -0500 Committer: Tyler Hobbs <ty...@datastax.com> Committed: Fri Aug 1 10:36:46 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/io/sstable/ColumnNameHelper.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b5990ae/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 2d9d912,c2ae6dc..a7c1ab0 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,6 +1,19 @@@ +2.1.1 + * 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) + + 2.1.0-final + * Fix min/max cell name collection on 2.0 SSTables with range + tombstones (CASSANDRA-7593) * Tolerate min/max cell names of different lengths (CASSANDRA-7651) * Filter cached results correctly (CASSANDRA-7636) * Fix tracing on the new SEPExecutor (CASSANDRA-7644)
