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/4b01e8fc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4b01e8fc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4b01e8fc Branch: refs/heads/cassandra-3.1 Commit: 4b01e8fc5c6931516ced47a08e1e6fdaaee7ed0f Parents: fffa6d8 7e3e119 Author: Benjamin Lerer <b.le...@gmail.com> Authored: Thu Dec 3 21:36:33 2015 +0100 Committer: Benjamin Lerer <b.le...@gmail.com> Committed: Thu Dec 3 21:36:33 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/stress/settings/SettingsCommandUser.java | 7 +------ 2 files changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b01e8fc/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 507a709,7932f51..dd5d22b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -28,8 -13,18 +28,9 @@@ 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) - * Fix IllegalArgumentException in DataOutputBuffer.reallocate for large buffers (CASSANDRA-10592) Merged from 2.1: ++ * Fix Stress profile parsing on Windows (CASSANDRA-10808) * Fix incremental repair hang when replica is down (CASSANDRA-10288) - * Avoid writing range tombstones after END_OF_ROW marker (CASSANDRA-10791) * Optimize the way we check if a token is repaired in anticompaction (CASSANDRA-10768) * Add proper error handling to stream receiver (CASSANDRA-10774) * Warn or fail when changing cluster topology live (CASSANDRA-10243)
