Merge branch 'cassandra-3.0' into cassandra-3.7
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a2dd0051
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a2dd0051
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a2dd0051
Branch: refs/heads/cassandra-3.7
Commit: a2dd00516988147f3d8a1e01ce330aa93d0024c2
Parents: 867a490 6f236c8
Author: Tyler Hobbs <tylerlho...@gmail.com>
Authored: Fri May 27 12:37:55 2016 -0500
Committer: Tyler Hobbs <tylerlho...@gmail.com>
Committed: Fri May 27 12:37:55 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 +
.../io/sstable/format/SSTableReader.java | 71 +-------------------
2 files changed, 3 insertions(+), 70 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a2dd0051/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2ceeea9,103eff0..0c447f5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,6 -1,6 +1,8 @@@
-3.0.7
+3.7
+ * Don't use static dataDirectories field in Directories instances
(CASSANDRA-11647)
+Merged from 3.0:
+ * Remove unneeded code to repair index summaries that have
+ been improperly down-sampled (CASSANDRA-11127)
* Avoid WriteTimeoutExceptions during commit log replay due to materialized
view lock contention (CASSANDRA-11891)
* Prevent OOM failures on SSTable corruption, improve tests for corruption
detection (CASSANDRA-9530)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a2dd0051/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
----------------------------------------------------------------------
