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/747e5fd4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/747e5fd4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/747e5fd4 Branch: refs/heads/trunk Commit: 747e5fd4ad54c9d5d691897db941dd10aa5bdabc Parents: 46da70e 95feab6 Author: Robert Stupp <[email protected]> Authored: Thu Nov 19 11:11:24 2015 +0100 Committer: Robert Stupp <[email protected]> Committed: Thu Nov 19 11:11:24 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/sstableloader | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/747e5fd4/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 2a9fbe7,14e8c3d..5e44f27 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -9,9 -3,20 +9,10 @@@ Merged from 2.2 * 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: + * 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) * Forbid compact clustering column type changes in ALTER TABLE (CASSANDRA-8879) * Reject incremental repair with subrange repair (CASSANDRA-10422) * Add a nodetool command to refresh size_estimates (CASSANDRA-9579)
