Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/05a54e0c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/05a54e0c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/05a54e0c Branch: refs/heads/trunk Commit: 05a54e0ce6715c15821764b9ec21480088669de5 Parents: ac1a9cd 65a4626 Author: Brandon Williams <[email protected]> Authored: Fri May 9 13:29:08 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Fri May 9 13:29:08 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
