Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a18402ca Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a18402ca Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a18402ca Branch: refs/heads/trunk Commit: a18402ca089b3a94dd7d1b22c9b97bd85657e0cc Parents: de1a96c f050133 Author: Stefania Alborghetti <stefania.alborghe...@datastax.com> Authored: Fri Apr 22 09:44:37 2016 +0800 Committer: Stefania Alborghetti <stefania.alborghe...@datastax.com> Committed: Fri Apr 22 09:44:37 2016 +0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/copyutil.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a18402ca/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 0704c57,fbccb6c..0c86ff7 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -75,14 -19,10 +75,15 @@@ Merged from 2.2 * Make deprecated repair methods backward-compatible with previous notification service (CASSANDRA-11430) * IncomingStreamingConnection version check message wrong (CASSANDRA-11462) Merged from 2.1: + * clqsh: COPY FROM throws TypeError with Cython extensions enabled (CASSANDRA-11574) * cqlsh: COPY FROM ignores NULL values in conversion (CASSANDRA-11549) -3.0.5 +3.5 + * StaticTokenTreeBuilder should respect posibility of duplicate tokens (CASSANDRA-11525) + * Correctly fix potential assertion error during compaction (CASSANDRA-11353) + * Avoid index segment stitching in RAM which lead to OOM on big SSTable files (CASSANDRA-11383) + * Fix clustering and row filters for LIKE queries on clustering columns (CASSANDRA-11397) +Merged from 3.0: * 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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/a18402ca/pylib/cqlshlib/copyutil.py ----------------------------------------------------------------------
