Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8d1bb075 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d1bb075 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d1bb075 Branch: refs/heads/trunk Commit: 8d1bb07530390128c1ec5d48daf438380a7cce8e Parents: 2faac19 9385cfd Author: Jonathan Ellis <jbel...@apache.org> Authored: Fri Oct 25 09:47:21 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Fri Oct 25 09:47:21 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
