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/97917960 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/97917960 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/97917960 Branch: refs/heads/trunk Commit: 9791796096cc2f61444169721bbc0ca03d9509e5 Parents: 53d0449 ae51086 Author: Robert Stupp <[email protected]> Authored: Sun Sep 13 11:34:31 2015 +0200 Committer: Robert Stupp <[email protected]> Committed: Sun Sep 13 11:34:31 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/cql3handling.py | 2 +- pylib/cqlshlib/cqlhandling.py | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/97917960/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index ffae4d9,dff47fc..bd24781 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,16 -1,7 +1,17 @@@ -2.1.10 +2.2.2 + * 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: + * BATCH statement is broken in cqlsh (CASSANDRA-10272) * Added configurable warning threshold for GC duration (CASSANDRA-8907) - * (cqlsh) Make cqlsh PEP8 compliant (CASSANDRA-10066) + * (cqlsh) Make cqlsh PEP8 Compliant (CASSANDRA-10066) * (cqlsh) Fix error when starting cqlsh with --debug (CASSANDRA-10282) * Scrub, Cleanup and Upgrade do not unmark compacting until all operations have completed, regardless of the occurence of exceptions (CASSANDRA-10274) http://git-wip-us.apache.org/repos/asf/cassandra/blob/97917960/pylib/cqlshlib/cql3handling.py ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/97917960/pylib/cqlshlib/cqlhandling.py ----------------------------------------------------------------------
