Merge branch 'cassandra-3.X' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/84b9b9a4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/84b9b9a4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/84b9b9a4 Branch: refs/heads/trunk Commit: 84b9b9a49d151a91b7288d29933c0e6345de5415 Parents: 8cb8c63 4fefdee Author: Stefania Alborghetti <stefania.alborghe...@datastax.com> Authored: Fri Jan 6 10:06:30 2017 +0100 Committer: Stefania Alborghetti <stefania.alborghe...@datastax.com> Committed: Fri Jan 6 10:06:30 2017 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/copyutil.py | 7 +++++++ 2 files changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/84b9b9a4/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index eb1ead7,b47ba37..f96e166 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -142,8 -131,9 +142,9 @@@ Merged from 3.0 * Remove pre-startup check for open JMX port (CASSANDRA-12074) * Remove compaction Severity from DynamicEndpointSnitch (CASSANDRA-11738) * Restore resumable hints delivery (CASSANDRA-11960) - * Properly report LWT contention (CASSANDRA-12626) + * Properly record CAS contention (CASSANDRA-12626) Merged from 3.0: + * Replace empty strings with null values if they cannot be converted (CASSANDRA-12794) * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620) * Add parent repair session id to anticompaction log message (CASSANDRA-12186) * Improve contention handling on failure to acquire MV lock for streaming and hints (CASSANDRA-12905)
