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/b06c637f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b06c637f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b06c637f Branch: refs/heads/trunk Commit: b06c637f11b0ef8e0063b806199c6c59f55358b6 Parents: 32f22a4 87f43ac Author: Marcus Eriksson <marc...@apache.org> Authored: Tue Oct 27 12:09:10 2015 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Tue Oct 27 12:09:10 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 5 +++++ 2 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b06c637f/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index ed28f2e,2ca3b43..24862b0 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,15 -1,12 +1,16 @@@ -2.1.12 +2.2.4 + * 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: + * Don't try to get ancestors from half-renamed sstables (CASSANDRA-10501) * Avoid repetition of JVM_OPTS in debian package (CASSANDRA-10251) * Fix potential NPE from handling result of SIM.highestSelectivityIndex (CASSANDRA-10550) - * Fix paging issues with partitions containing only static columns data - (CASSANDRA-10381) + * Fix paging issues with partitions containing only static columns data (CASSANDRA-10381) * Fix conditions on static columns (CASSANDRA-10264) * AssertionError: attempted to delete non-existing file CommitLog (CASSANDRA-10377) - * Merge range tombstones during compaction (CASSANDRA-7953) * (cqlsh) Distinguish negative and positive infinity in output (CASSANDRA-10523) * (cqlsh) allow custom time_format for COPY TO (CASSANDRA-8970) * Don't allow startup if the node's rack has changed (CASSANDRA-10242) http://git-wip-us.apache.org/repos/asf/cassandra/blob/b06c637f/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
