Merge branch cassandra-3.0 into cassandra-3.7
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/867a4900 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/867a4900 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/867a4900 Branch: refs/heads/trunk Commit: 867a4900994d31accf06daae165c335aaad64fa0 Parents: f24e066 6f02446 Author: Benjamin Lerer <[email protected]> Authored: Fri May 27 11:09:19 2016 +0200 Committer: Benjamin Lerer <[email protected]> Committed: Fri May 27 11:09:35 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/commitlog/CommitLog.java | 8 ++------ .../cassandra/db/commitlog/CommitLogSegment.java | 16 +++++++++++++++- 3 files changed, 18 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/867a4900/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/867a4900/src/java/org/apache/cassandra/db/commitlog/CommitLog.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/867a4900/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java ----------------------------------------------------------------------
