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/a90c3b2b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a90c3b2b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a90c3b2b Branch: refs/heads/trunk Commit: a90c3b2b85daa9cbc3fc41b823c08a4a87afd768 Parents: 3841f9c 68ea4ed Author: Tyler Hobbs <tylerlho...@gmail.com> Authored: Wed Nov 25 11:56:16 2015 -0600 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Wed Nov 25 11:56:16 2015 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh.py | 2 ++ 2 files changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a90c3b2b/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index a274ea9,8548d71..5ff53b6 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,6 +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: + * (cqlsh) Print column names before COPY operation (CASSANDRA-8935) - * Add Native-Transport-Requests back to tpstats (CASSANDRA-10044) * Make paging logic consistent between searcher impls (CASSANDRA-10683) * Fix CompressedInputStream for proper cleanup (CASSANDRA-10012) * (cqlsh) Support counters in COPY commands (CASSANDRA-9043)
