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/b407ebc8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b407ebc8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b407ebc8 Branch: refs/heads/cassandra-2.1 Commit: b407ebc895603e33af763cbf30ca661192cf7eec Parents: e3d5b98 4632673 Author: Tyler Hobbs <[email protected]> Authored: Thu Jul 31 17:33:03 2014 -0500 Committer: Tyler Hobbs <[email protected]> Committed: Thu Jul 31 17:33:03 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/filter/ColumnSlice.java | 21 ++++++- .../cassandra/db/filter/SliceQueryFilter.java | 1 - .../cassandra/db/filter/ColumnSliceTest.java | 66 ++++++++++++++++++++ 4 files changed, 85 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b407ebc8/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 2501e51,fcccccd..5f83eef --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,5 +1,18 @@@ +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 + * Tolerate min/max cell names of different lengths (CASSANDRA-7651) * Filter cached results correctly (CASSANDRA-7636) * Fix tracing on the new SEPExecutor (CASSANDRA-7644) * Remove shuffle and taketoken (CASSANDRA-7601) http://git-wip-us.apache.org/repos/asf/cassandra/blob/b407ebc8/src/java/org/apache/cassandra/db/filter/ColumnSlice.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b407ebc8/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b407ebc8/test/unit/org/apache/cassandra/db/filter/ColumnSliceTest.java ----------------------------------------------------------------------
