Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0bc2164d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0bc2164d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0bc2164d Branch: refs/heads/trunk Commit: 0bc2164df244487ef2870c44dfbbd4321378fa49 Parents: 834f2a6 30c35dd Author: Jason Brown <jasedbr...@gmail.com> Authored: Tue Feb 13 15:38:58 2018 -0800 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Tue Feb 13 15:41:29 2018 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../unit/org/apache/cassandra/cql3/ViewComplexTest.java | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0bc2164d/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index d7f1f4e,ba72406..54b587d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -208,7 -20,8 +208,8 @@@ * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897) * Update jackson JSON jars (CASSANDRA-13949) * Avoid locks when checking LCS fanout and if we should defrag (CASSANDRA-13930) - * Correctly count range tombstones in traces and tombstone thresholds (CASSANDRA-8527) Merged from 3.0: ++ * Fix unit test failures in ViewComplexTest (CASSANDRA-14219) * Add MinGW uname check to start scripts (CASSANDRA-12840) * Use the correct digest file and reload sstable metadata in nodetool verify (CASSANDRA-14217) * Handle failure when mutating repaired status in Verifier (CASSANDRA-13933) http://git-wip-us.apache.org/repos/asf/cassandra/blob/0bc2164d/test/unit/org/apache/cassandra/cql3/ViewComplexTest.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
