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/7d17f66e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7d17f66e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7d17f66e Branch: refs/heads/cassandra-2.2 Commit: 7d17f66e72b4ff47c2004a4e02c7d461de7a5cb3 Parents: 35cf8a3 c3ba6c8 Author: Benedict Elliott Smith <[email protected]> Authored: Tue Oct 13 09:33:45 2015 +0100 Committer: Benedict Elliott Smith <[email protected]> Committed: Tue Oct 13 09:33:45 2015 +0100 ---------------------------------------------------------------------- src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7d17f66e/src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java ----------------------------------------------------------------------
