Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/958ba452 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/958ba452 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/958ba452 Branch: refs/heads/cassandra-3.11 Commit: 958ba452e7ab4885bd54c5bffaa4640e9b8ca9b1 Parents: 4ed9df6 11f7ba9 Author: Stefania Alborghetti <[email protected]> Authored: Thu Dec 22 10:29:15 2016 +0800 Committer: Stefania Alborghetti <[email protected]> Committed: Thu Dec 22 10:29:15 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/958ba452/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index e24dd19,487e1ac..b68fbfd --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -195,12 -81,10 +195,13 @@@ Merged from 2.2 * Fix exceptions when enabling gossip on nodes that haven't joined the ring (CASSANDRA-12253) * Fix authentication problem when invoking cqlsh copy from a SOURCE command (CASSANDRA-12642) * Decrement pending range calculator jobs counter in finally block - (CASSANDRA-12554) + * cqlshlib tests: increase default execute timeout (CASSANDRA-12481) + * 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) * Split consistent range movement flag correction (CASSANDRA-12786) Merged from 2.1: - * Add system property to set the max number of native transport requests in queue (CASSANDRA-11363) ++ * cqlsh copy-from: sort user type fields in csv (CASSANDRA-12959) * Don't skip sstables based on maxLocalDeletionTime (CASSANDRA-12765) http://git-wip-us.apache.org/repos/asf/cassandra/blob/958ba452/pylib/cqlshlib/copyutil.py ----------------------------------------------------------------------
