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/f10d2ed9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f10d2ed9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f10d2ed9 Branch: refs/heads/trunk Commit: f10d2ed955bca4cf2b010e31e5cf14a604624d9a Parents: ccb738f da8be1c Author: Sam Tunnicliffe <s...@beobal.com> Authored: Wed Oct 21 09:31:24 2015 +0100 Committer: Sam Tunnicliffe <s...@beobal.com> Committed: Wed Oct 21 09:31:24 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/index/SecondaryIndexManager.java | 11 +++++++---- src/java/org/apache/cassandra/service/StorageProxy.java | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f10d2ed9/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 4f5e8a7,2a28a86..560472a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,13 -1,10 +1,14 @@@ -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: + * 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/f10d2ed9/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f10d2ed9/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------
