Merge branch 'cassandra-3.X' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/634f495b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/634f495b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/634f495b Branch: refs/heads/trunk Commit: 634f495bae1fe65c7de232875cc25ab4940fa4ea Parents: 4f40f64 a224b2f Author: Stefania Alborghetti <[email protected]> Authored: Thu Dec 22 10:29:46 2016 +0800 Committer: Stefania Alborghetti <[email protected]> Committed: Thu Dec 22 10:29:46 2016 +0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/copyutil.py | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/634f495b/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 618446d,63dfa55..8f49ccd --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -225,9 -216,9 +225,10 @@@ Merged from 2.2 * Forward writes to replacement node when replace_address != broadcast_address (CASSANDRA-8523) * Fail repair on non-existing table (CASSANDRA-12279) * Enable repair -pr and -local together (fix regression of CASSANDRA-7450) (CASSANDRA-12522) + * Better handle invalid system roles table (CASSANDRA-12700) * Split consistent range movement flag correction (CASSANDRA-12786) Merged from 2.1: + * cqlsh copy-from: sort user type fields in csv (CASSANDRA-12959) * Don't skip sstables based on maxLocalDeletionTime (CASSANDRA-12765)
