Merge branch 'cassandra-3.0' into cassandra-3.11 cassandra-3.11.1
authorMarcus Eriksson <marcuse@apache.org>
Mon, 2 Oct 2017 07:34:49 +0000 (09:34 +0200)
committerMarcus Eriksson <marcuse@apache.org>
Mon, 2 Oct 2017 07:34:49 +0000 (09:34 +0200)
commit983c72a84ab6628e09a78ead9e20a0c323a005af
tree2e6dc22b6befc997c0e7871400fb8bc675090914
parent9d56132ae8dfd2a31d8bf94bd60bac550bbfc522
parentb32a9e6452c78e6ad08e371314bf1ab7492d0773
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