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/82dabe0c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/82dabe0c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/82dabe0c Branch: refs/heads/cassandra-2.2 Commit: 82dabe0cf59ea3b9917ded46fe1c6caf6314d782 Parents: 87fa9be ad93f3b Author: Robert Stupp <sn...@snazy.de> Authored: Fri Oct 9 13:10:01 2015 +0200 Committer: Robert Stupp <sn...@snazy.de> Committed: Fri Oct 9 13:10:01 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- conf/cassandra-env.sh | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/82dabe0c/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 4e64134,7aa5eac..d57cc07 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,23 -1,9 +1,24 @@@ -2.1.11 +2.2.3 + * cqlsh pg-style-strings broken (CASSANDRA-10484) + * Make Hadoop CF splits more polite to custom orderered partitioners (CASSANDRA-10400) +Merged from 2.1: + * Allow LOCAL_JMX to be easily overridden (CASSANDRA-10275) + * Mark nodes as dead even if they've already left (CASSANDRA-10205) * Update internal python driver used by cqlsh (CASSANDRA-10161) -2.1.10 +2.2.2 + * cqlsh prompt includes name of keyspace after failed `use` statement (CASSANDRA-10369) + * Configurable page size in cqlsh (CASSANDRA-9855) + * Defer default role manager setup until all nodes are on 2.2+ (CASSANDRA-9761) + * Cancel transaction for sstables we wont redistribute index summary + for (CASSANDRA-10270) + * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209) + * Retry snapshot deletion after compaction and gc on Windows (CASSANDRA-10222) + * Fix failure to start with space in directory path on Windows (CASSANDRA-10239) + * Fix repair hang when snapshot failed (CASSANDRA-10057) + * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks + (CASSANDRA-10199) +Merged from 2.1: - * Mark nodes as dead even if they've already left (CASSANDRA-10205) * Bulk Loader API could not tolerate even node failure (CASSANDRA-10347) * Avoid misleading pushed notifications when multiple nodes share an rpc_address (CASSANDRA-10052) http://git-wip-us.apache.org/repos/asf/cassandra/blob/82dabe0c/conf/cassandra-env.sh ----------------------------------------------------------------------
