Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c9285d0e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c9285d0e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c9285d0e Branch: refs/heads/cassandra-3.0 Commit: c9285d0e30ce52b21ce38fe4963cdc2e35246354 Parents: f050133 5f99629 Author: Robert Stupp <[email protected]> Authored: Mon Apr 25 10:21:25 2016 +0200 Committer: Robert Stupp <[email protected]> Committed: Mon Apr 25 10:21:25 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ pylib/cqlshlib/copyutil.py | 17 +++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c9285d0e/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index fbccb6c,affb723..de17a70 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -14,31 -3,19 +14,33 @@@ Merged from 2.2 * cqlsh: COPY FROM should use regular inserts for single statement batches and report errors correctly if workers processes crash on initialization (CASSANDRA-11474) * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553) + * Allow only DISTINCT queries with partition keys restrictions (CASSANDRA-11339) + * CqlConfigHelper no longer requires both a keystore and truststore to work (CASSANDRA-11532) + * Make deprecated repair methods backward-compatible with previous notification service (CASSANDRA-11430) + * IncomingStreamingConnection version check message wrong (CASSANDRA-11462) Merged from 2.1: + * cqlsh COPY FROM fails with []{} chars in UDT/tuple fields/values (CASSANDRA-11633) * clqsh: COPY FROM throws TypeError with Cython extensions enabled (CASSANDRA-11574) * cqlsh: COPY FROM ignores NULL values in conversion (CASSANDRA-11549) - * (cqlsh) Fix potential COPY deadlock when parent process is terminating child - processes (CASSANDRA-11505) + -2.2.6 - * Allow only DISTINCT queries with partition keys restrictions (CASSANDRA-11339) - * CqlConfigHelper no longer requires both a keystore and truststore to work (CASSANDRA-11532) - * Make deprecated repair methods backward-compatible with previous notification service (CASSANDRA-11430) - * IncomingStreamingConnection version check message wrong (CASSANDRA-11462) +3.0.5 + * Fix rare NPE on schema upgrade from 2.x to 3.x (CASSANDRA-10943) + * Improve backoff policy for cqlsh COPY FROM (CASSANDRA-11320) + * Improve IF NOT EXISTS check in CREATE INDEX (CASSANDRA-11131) + * Upgrade ohc to 0.4.3 + * Enable SO_REUSEADDR for JMX RMI server sockets (CASSANDRA-11093) + * Allocate merkletrees with the correct size (CASSANDRA-11390) + * Support streaming pre-3.0 sstables (CASSANDRA-10990) + * Add backpressure to compressed commit log (CASSANDRA-10971) + * SSTableExport supports secondary index tables (CASSANDRA-11330) + * Fix sstabledump to include missing info in debug output (CASSANDRA-11321) + * Establish and implement canonical bulk reading workload(s) (CASSANDRA-10331) + * Fix paging for IN queries on tables without clustering columns (CASSANDRA-11208) + * Remove recursive call from CompositesSearcher (CASSANDRA-11304) + * Fix filtering on non-primary key columns for queries without index (CASSANDRA-6377) + * Fix sstableloader fail when using materialized view (CASSANDRA-11275) +Merged from 2.2: * DatabaseDescriptor should log stacktrace in case of Eception during seed provider creation (CASSANDRA-11312) * Use canonical path for directory in SSTable descriptor (CASSANDRA-10587) * Add cassandra-stress keystore option (CASSANDRA-9325) http://git-wip-us.apache.org/repos/asf/cassandra/blob/c9285d0e/pylib/cqlshlib/copyutil.py ----------------------------------------------------------------------
