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/58cf4c90 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/58cf4c90 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/58cf4c90 Branch: refs/heads/trunk Commit: 58cf4c90742a628853132aacf2333ccc94eb480e Parents: f1c3aac 075539a Author: Jason Brown <[email protected]> Authored: Mon Nov 21 06:47:44 2016 -0800 Committer: Jason Brown <[email protected]> Committed: Mon Nov 21 06:48:52 2016 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../repair/messages/AnticompactionRequest.java | 19 ++ .../repair/messages/CleanupMessage.java | 17 ++ .../repair/messages/PrepareMessage.java | 22 +++ .../repair/messages/SnapshotMessage.java | 16 ++ .../cassandra/repair/messages/SyncComplete.java | 19 ++ .../cassandra/repair/messages/SyncRequest.java | 21 +++ .../repair/messages/ValidationComplete.java | 18 ++ .../RepairMessageSerializationsTest.java | 188 +++++++++++++++++++ 9 files changed, 321 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/58cf4c90/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 9ad67d1,24641a6..fa9233a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -109,8 -104,8 +109,9 @@@ * 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: ++ * AnticompactionRequestSerializer serializedSize is incorrect (CASSANDRA-12934) * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535) * Pass root cause to CorruptBlockException when uncompression failed (CASSANDRA-12889) * Batch with multiple conditional updates for the same partition causes AssertionError (CASSANDRA-12867)
