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/15b0bd6d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/15b0bd6d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/15b0bd6d Branch: refs/heads/cassandra-3.0 Commit: 15b0bd6d0369ec8d461996c1249dd8921c75d036 Parents: 78f46de 757e314 Author: Yuki Morishita <[email protected]> Authored: Wed Feb 17 10:26:48 2016 -0600 Committer: Yuki Morishita <[email protected]> Committed: Wed Feb 17 10:26:48 2016 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cassandra | 2 +- bin/cassandra.ps1 | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/15b0bd6d/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 2a3854b,c40c3ce..968c8b1 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,15 -1,5 +1,16 @@@ -2.1.14 +2.2.6 + * cqlsh pg-style-strings broken if line ends with ';' (CASSANDRA-11123) + * Use cloned TokenMetadata in size estimates to avoid race against membership check + (CASSANDRA-10736) + * Always persist upsampled index summaries (CASSANDRA-10512) + * (cqlsh) Fix inconsistent auto-complete (CASSANDRA-10733) + * Make SELECT JSON and toJson() threadsafe (CASSANDRA-11048) + * Fix SELECT on tuple relations for mixed ASC/DESC clustering order (CASSANDRA-7281) + * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030) + * Fix paging on DISTINCT queries repeats result when first row in partition changes + (CASSANDRA-10010) +Merged from 2.1: + * Use logback setting for 'cassandra -v' command (CASSANDRA-10767) * Fix sstableloader to unthrottle streaming by default (CASSANDRA-9714) * Fix incorrect warning in 'nodetool status' (CASSANDRA-10176) * Properly release sstable ref when doing offline scrub (CASSANDRA-10697) http://git-wip-us.apache.org/repos/asf/cassandra/blob/15b0bd6d/bin/cassandra ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/15b0bd6d/bin/cassandra.ps1 ----------------------------------------------------------------------
