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/a8a3d4e2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a8a3d4e2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a8a3d4e2 Branch: refs/heads/trunk Commit: a8a3d4e282334216a39ceeabea06b9f60f7b4dc1 Parents: 6991556 377f611 Author: Stefania Alborghetti <stefania.alborghe...@datastax.com> Authored: Fri Apr 7 09:02:59 2017 +0800 Committer: Stefania Alborghetti <stefania.alborghe...@datastax.com> Committed: Fri Apr 7 09:03:54 2017 +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/a8a3d4e2/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 212c738,e01a63c..5bcdf16 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -22,21 -4,8 +22,22 @@@ Merged from 2.2 * Discard in-flight shadow round responses (CASSANDRA-12653) * Don't anti-compact repaired data to avoid inconsistencies (CASSANDRA-13153) * Wrong logger name in AnticompactionTask (CASSANDRA-13343) + * Commitlog replay may fail if last mutation is within 4 bytes of end of segment (CASSANDRA-13282) * Fix queries updating multiple time the same list (CASSANDRA-13130) * Fix GRANT/REVOKE when keyspace isn't specified (CASSANDRA-13053) - ++Merged from 2.1: ++ * Fix ParseError unhashable type list in cqlsh copy from (CASSANDRA-13364) + +3.0.12 + * Prevent data loss on upgrade 2.1 - 3.0 by adding component separator to LogRecord absolute path (CASSANDRA-13294) + * Improve testing on macOS by eliminating sigar logging (CASSANDRA-13233) + * Cqlsh copy-from should error out when csv contains invalid data for collections (CASSANDRA-13071) + * Update c.yaml doc for offheap memtables (CASSANDRA-13179) + * Faster StreamingHistogram (CASSANDRA-13038) + * Legacy deserializer can create unexpected boundary range tombstones (CASSANDRA-13237) + * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070) + * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185) +Merged from 2.2: * Avoid race on receiver by starting streaming sender thread after sending init message (CASSANDRA-12886) * Fix "multiple versions of ant detected..." when running ant test (CASSANDRA-13232) * Coalescing strategy sleeps too much (CASSANDRA-13090) http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8a3d4e2/pylib/cqlshlib/copyutil.py ----------------------------------------------------------------------
