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/b4b26840 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b4b26840 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b4b26840 Branch: refs/heads/trunk Commit: b4b268407f6bf1d1137099c1b34ca3fb91733bd1 Parents: a549bd0 dc73c0b Author: Aleksey Yeschenko <alek...@apache.org> Authored: Wed Nov 4 12:58:21 2015 +0000 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Wed Nov 4 12:58:21 2015 +0000 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ conf/logback-tools.xml | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4b26840/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 5c23acf,fd6c8a1..f25ac7e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,6 +1,13 @@@ -2.1.12 +2.2.4 + * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581) + * 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: + * Fix logback-tools.xml incorrectly configured for outputing to System.err + (CASSANDRA-9937) * Fix streaming to catch exception so retry not fail (CASSANDRA-10557) * Add validation method to PerRowSecondaryIndex (CASSANDRA-10092) * Support encrypted and plain traffic on the same port (CASSANDRA-10559)