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/a9075339 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a9075339 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a9075339 Branch: refs/heads/cassandra-3.1 Commit: a9075339227fc689a04977f0b9fa714cbc958f15 Parents: 1142183 f5a09c1 Author: Sam Tunnicliffe <s...@beobal.com> Authored: Wed Nov 25 10:01:12 2015 +0000 Committer: Sam Tunnicliffe <s...@beobal.com> Committed: Wed Nov 25 10:01:12 2015 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9075339/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index d11be26,91f4577..a274ea9 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,5 +1,18 @@@ -2.1.12 +2.2.4 + * Don't do anticompaction after subrange repair (CASSANDRA-10422) + * Fix SimpleDateType type compatibility (CASSANDRA-10027) + * (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: + * Make paging logic consistent between searcher impls (CASSANDRA-10683) * Fix CompressedInputStream for proper cleanup (CASSANDRA-10012) * (cqlsh) Support counters in COPY commands (CASSANDRA-9043) * Try next replica if not possible to connect to primary replica on http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9075339/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java ----------------------------------------------------------------------
