Merge branch 'cassandra-3.0' into cassandra-3.11
authorMarcus Eriksson <marcuse@apache.org>
Mon, 19 Feb 2018 15:53:43 +0000 (07:53 -0800)
committerMarcus Eriksson <marcuse@apache.org>
Mon, 19 Feb 2018 15:53:43 +0000 (07:53 -0800)
commitabd9be1e4639c975b1fdf5d1ce26f6095236bb74
treeb841a6c005fe9f55a659f206e533dab144c2ccc9
parenta798257cefe96147370ecae87b7c07fe55769816
parentd73f45bad4cd6d8cf1cea7d9b35b76075dc277e1
Merge branch 'cassandra-3.0' into cassandra-3.11
CHANGES.txt
src/java/org/apache/cassandra/db/lifecycle/LogFile.java
src/java/org/apache/cassandra/db/lifecycle/LogRecord.java
src/java/org/apache/cassandra/db/lifecycle/LogTransaction.java
src/java/org/apache/cassandra/db/lifecycle/Tracker.java
test/unit/org/apache/cassandra/db/lifecycle/HelpersTest.java