Merge branch cassandra-3.7 into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d9b192e3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d9b192e3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d9b192e3 Branch: refs/heads/trunk Commit: d9b192e33a746fd30b635548719a2ecfdae6d4a1 Parents: 4927848 867a490 Author: Benjamin Lerer <[email protected]> Authored: Fri May 27 11:10:52 2016 +0200 Committer: Benjamin Lerer <[email protected]> Committed: Fri May 27 11:11:02 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/d9b192e3/CHANGES.txt ----------------------------------------------------------------------
