Merge branch cassandra-2.1 into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e22faeb8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e22faeb8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e22faeb8 Branch: refs/heads/cassandra-2.2 Commit: e22faeb8c5463a34b630aff8e265aefbe950b58d Parents: 96c53e0 2dd244b Author: Benjamin Lerer <b.le...@gmail.com> Authored: Mon Apr 11 09:43:56 2016 +0200 Committer: Benjamin Lerer <b.le...@gmail.com> Committed: Mon Apr 11 09:44:08 2016 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/commitlog/CommitLog.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e22faeb8/src/java/org/apache/cassandra/db/commitlog/CommitLog.java ----------------------------------------------------------------------
