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/95feab66 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/95feab66 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/95feab66 Branch: refs/heads/cassandra-2.2 Commit: 95feab6631f96315db3587f42c6c190a9745c2a7 Parents: 4e48324 4f2337f Author: Robert Stupp <sn...@snazy.de> Authored: Thu Nov 19 11:09:11 2015 +0100 Committer: Robert Stupp <sn...@snazy.de> Committed: Thu Nov 19 11:09:11 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- bin/sstableloader | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/95feab66/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 4e19b23,94a9ae2..14e8c3d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,18 -1,6 +1,19 @@@ -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) Improve COPY TO performance and error handling (CASSANDRA-9304) + * sstableloader does not use MAX_HEAP_SIZE env parameter (CASSANDRA-10188) + * (cqlsh) Improve COPY TO performance and error handling (CASSANDRA-9304) * Don't remove level info when running upgradesstables (CASSANDRA-10692) * Create compression chunk for sending file only (CASSANDRA-10680) * Make buffered read size configurable (CASSANDRA-10249)
