Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ef6fa373 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ef6fa373 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ef6fa373 Branch: refs/heads/trunk Commit: ef6fa37337ac75586d3b12d5e9bc0565dc9a1ace Parents: fc868c5 d6ea0ff Author: Aleksey Yeschenko <[email protected]> Authored: Mon Mar 9 20:20:16 2015 -0700 Committer: Aleksey Yeschenko <[email protected]> Committed: Mon Mar 9 20:20:16 2015 -0700 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ .../apache/cassandra/locator/AbstractReplicationStrategy.java | 6 ++++++ 2 files changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef6fa373/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index f5e1a1d,d240a10..b2ac1aa --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,40 -1,6 +1,43 @@@ +2.1.4 + * Add SimpleDate (cql date) and Time (cql time) types (CASSANDRA-7523) + * Use long for key count in cfstats (CASSANDRA-8913) + * Make SSTableRewriter.abort() more robust to failure (CASSANDRA-8832) + * Remove cold_reads_to_omit from STCS (CASSANDRA-8860) + * Make EstimatedHistogram#percentile() use ceil instead of floor (CASSANDRA-8883) + * Fix top partitions reporting wrong cardinality (CASSANDRA-8834) + * Fix rare NPE in KeyCacheSerializer (CASSANDRA-8067) + * Pick sstables for validation as late as possible inc repairs (CASSANDRA-8366) + * Fix commitlog getPendingTasks to not increment (CASSANDRA-8856) + * Fix parallelism adjustment in range and secondary index queries + when the first fetch does not satisfy the limit (CASSANDRA-8856) + * Check if the filtered sstables is non-empty in STCS (CASSANDRA-8843) + * Upgrade java-driver used for cassandra-stress (CASSANDRA-8842) + * Fix CommitLog.forceRecycleAllSegments() memory access error (CASSANDRA-8812) + * Improve assertions in Memory (CASSANDRA-8792) + * Fix SSTableRewriter cleanup (CASSANDRA-8802) + * Introduce SafeMemory for CompressionMetadata.Writer (CASSANDRA-8758) + * 'nodetool info' prints exception against older node (CASSANDRA-8796) + * Ensure SSTableReader.last corresponds exactly with the file end (CASSANDRA-8750) + * Make SSTableWriter.openEarly more robust and obvious (CASSANDRA-8747) + * Enforce SSTableReader.first/last (CASSANDRA-8744) + * Cleanup SegmentedFile API (CASSANDRA-8749) + * Avoid overlap with early compaction replacement (CASSANDRA-8683) + * Safer Resource Management++ (CASSANDRA-8707) + * Write partition size estimates into a system table (CASSANDRA-7688) + * cqlsh: Fix keys() and full() collection indexes in DESCRIBE output + (CASSANDRA-8154) + * Show progress of streaming in nodetool netstats (CASSANDRA-8886) + * IndexSummaryBuilder utilises offheap memory, and shares data between + each IndexSummary opened from it (CASSANDRA-8757) + * markCompacting only succeeds if the exact SSTableReader instances being + marked are in the live set (CASSANDRA-8689) + * cassandra-stress support for varint (CASSANDRA-8882) + * Fix Adler32 digest for compressed sstables (CASSANDRA-8778) + * Add nodetool statushandoff/statusbackup (CASSANDRA-8912) +Merged from 2.0: + 2.0.14: + * Provide better exceptions for invalid replication strategy parameters + (CASSANDRA-8909) * Fix regression in mixed single and multi-column relation support for SELECT statements (CASSANDRA-8613) * Add ability to limit number of native connections (CASSANDRA-8086)
