Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b9b1ec80 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b9b1ec80 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b9b1ec80 Branch: refs/heads/trunk Commit: b9b1ec803dbcd99a72f7502fe1466208061bd8e6 Parents: c9a3241 c73ec67 Author: Joshua McKenzie <jmcken...@apache.org> Authored: Fri Aug 28 11:04:10 2015 -0400 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Fri Aug 28 11:04:10 2015 -0400 ---------------------------------------------------------------------- .../apache/cassandra/db/commitlog/CommitLog.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
