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/bd2970f1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bd2970f1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bd2970f1 Branch: refs/heads/trunk Commit: bd2970f19f52f495fe39bd3e3002aa4f58891f70 Parents: d568313 0dc8440 Author: Yuki Morishita <yu...@apache.org> Authored: Thu Nov 10 09:34:46 2016 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Thu Nov 10 09:34:46 2016 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/io/compress/CompressedSequentialWriter.java | 2 +- src/java/org/apache/cassandra/io/util/CompressedChunkReader.java | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd2970f1/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 69a05c2,e765a9c..9678ca1 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -107,8 -99,9 +107,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: + * Pass root cause to CorruptBlockException when uncompression failed (CASSANDRA-12889) * Batch with multiple conditional updates for the same partition causes AssertionError (CASSANDRA-12867) * Make AbstractReplicationStrategy extendable from outside its package (CASSANDRA-12788) * Don't tell users to turn off consistent rangemovements during rebuild. (CASSANDRA-12296)
