Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c73ec67c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c73ec67c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c73ec67c Branch: refs/heads/cassandra-3.0 Commit: c73ec67c0555e299e62ccc8a732cd097faa910a7 Parents: 196b7ab c5158e5 Author: Joshua McKenzie <jmcken...@apache.org> Authored: Fri Aug 28 11:03:51 2015 -0400 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Fri Aug 28 11:03:51 2015 -0400 ---------------------------------------------------------------------- .../apache/cassandra/db/commitlog/CommitLog.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c73ec67c/src/java/org/apache/cassandra/db/commitlog/CommitLog.java ----------------------------------------------------------------------
