Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d7cb6f61 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d7cb6f61 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d7cb6f61 Branch: refs/heads/cassandra-3.0 Commit: d7cb6f61adec951c082cdeea64ffe5f68b8f7651 Parents: 9961b69 ecbeb08 Author: Jason Brown <jasedbr...@gmail.com> Authored: Fri Feb 26 14:49:35 2016 -0800 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Fri Feb 26 14:50:13 2016 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/dht/Range.java | 20 +++++++++++--------- .../org/apache/cassandra/dht/RangeTest.java | 15 +++++++++++++++ 3 files changed, 27 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d7cb6f61/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index fbc1c8a,aa3adf5..2dacd3a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,24 -1,5 +1,25 @@@ -2.2.6 +3.0.4 + * MV should only query complex columns included in the view (CASSANDRA-11069) + * Failed aggregate creation breaks server permanently (CASSANDRA-11064) + * Add sstabledump tool (CASSANDRA-7464) + * Introduce backpressure for hints (CASSANDRA-10972) + * Fix ClusteringPrefix not being able to read tombstone range boundaries (CASSANDRA-11158) + * Prevent logging in sandboxed state (CASSANDRA-11033) + * Disallow drop/alter operations of UDTs used by UDAs (CASSANDRA-10721) + * Add query time validation method on Index (CASSANDRA-11043) + * Avoid potential AssertionError in mixed version cluster (CASSANDRA-11128) + * Properly handle hinted handoff after topology changes (CASSANDRA-5902) + * AssertionError when listing sstable files on inconsistent disk state (CASSANDRA-11156) + * Fix wrong rack counting and invalid conditions check for TokenAllocation + (CASSANDRA-11139) + * Avoid creating empty hint files (CASSANDRA-11090) + * Fix leak detection strong reference loop using weak reference (CASSANDRA-11120) + * Configurie BatchlogManager to stop delayed tasks on shutdown (CASSANDRA-11062) + * Hadoop integration is incompatible with Cassandra Driver 3.0.0 (CASSANDRA-11001) + * Add dropped_columns to the list of schema table so it gets handled + properly (CASSANDRA-11050) +Merged from 2.2: + * Range.compareTo() violates the contract of Comparable (CASSANDRA-11216) * Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167) * Replacing an aggregate with a new version doesn't reset INITCOND (CASSANDRA-10840) * (cqlsh) cqlsh cannot be called through symlink (CASSANDRA-11037) http://git-wip-us.apache.org/repos/asf/cassandra/blob/d7cb6f61/src/java/org/apache/cassandra/dht/Range.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d7cb6f61/test/unit/org/apache/cassandra/dht/RangeTest.java ----------------------------------------------------------------------
