Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d84b42b3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d84b42b3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d84b42b3 Branch: refs/heads/cassandra-2.2 Commit: d84b42b325f711e9a7cf0ae65c2428b884464936 Parents: e487553 9ab1c83 Author: Yuki Morishita <yu...@apache.org> Authored: Thu Nov 12 09:44:18 2015 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Thu Nov 12 09:44:18 2015 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d84b42b3/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 0fcf037,d0c0af9..2cfcb55 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,15 -1,5 +1,16 @@@ -2.1.12 +2.2.4 + * (Hadoop) fix splits calculation (CASSANDRA-10640) + * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058) + * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645) + * Use most up-to-date version of schema for system tables (CASSANDRA-10652) + * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628) + * Expose phi values from failure detector via JMX and tweak debug + and trace logging (CASSANDRA-9526) + * Fix RangeNamesQueryPager (CASSANDRA-10509) + * Deprecate Pig support (CASSANDRA-10542) + * Reduce contention getting instances of CompositeType (CASSANDRA-10433) +Merged from 2.1: + * Shutdown compaction in drain to prevent leak (CASSANDRA-10079) * Invalidate cache after stream receive task is completed (CASSANDRA-10341) * Reject counter writes in CQLSSTableWriter (CASSANDRA-10258) * Remove superfluous COUNTER_MUTATION stage mapping (CASSANDRA-10605)
