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/edca4dce Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/edca4dce Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/edca4dce Branch: refs/heads/trunk Commit: edca4dcecca168f55781f099bc8932c226aa7daa Parents: 6367987 81e520c Author: Aleksey Yeschenko <[email protected]> Authored: Fri Nov 6 15:25:53 2015 +0000 Committer: Aleksey Yeschenko <[email protected]> Committed: Fri Nov 6 15:25:53 2015 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/edca4dce/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 7e969a5,14a7fbd..c33b8c9 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,12 -1,5 +1,13 @@@ -2.1.12 +2.2.4 + * 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) fix COPY using wrong variable name for time_format (CASSANDRA-10633) * Do not run SizeEstimatesRecorder if a node is not a member of the ring (CASSANDRA-9912) * Improve handling of dead nodes in gossip (CASSANDRA-10298) * Fix logback-tools.xml incorrectly configured for outputing to System.err
