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/b7d5f5a1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b7d5f5a1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b7d5f5a1 Branch: refs/heads/trunk Commit: b7d5f5a16a656e36f11d26b69e423c29ea31a04e Parents: 70d18cd 259e17d Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri May 9 10:05:46 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri May 9 10:05:46 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java | 2 +- test/unit/org/apache/cassandra/db/CommitLogTest.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
