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/5062bb6e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5062bb6e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5062bb6e Branch: refs/heads/trunk Commit: 5062bb6eb05ae9fe376b7738c5170ff92e48636f Parents: 2b08690 bb68078 Author: Stefania Alborghetti <stefania.alborghe...@datastax.com> Authored: Thu Apr 21 10:18:26 2016 +0800 Committer: Stefania Alborghetti <stefania.alborghe...@datastax.com> Committed: Thu Apr 21 10:18:26 2016 +0800 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- pylib/cqlshlib/copyutil.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5062bb6e/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index f6ec738,eb2405c..9f67555 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -70,14 -16,10 +70,15 @@@ Merged from 2.2 * 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 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/5062bb6e/pylib/cqlshlib/copyutil.py ----------------------------------------------------------------------
