Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/cassandra into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/097df178 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/097df178 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/097df178 Branch: refs/heads/trunk Commit: 097df178e6035ff808334cc3bb4311b957b08454 Parents: dff6803 f81864e Author: Dave Brosius <[email protected]> Authored: Sat Oct 13 00:04:23 2012 -0400 Committer: Dave Brosius <[email protected]> Committed: Sat Oct 13 00:04:23 2012 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/commitlog/CommitLog.java | 2 +- .../cassandra/db/commitlog/CommitLogSegment.java | 12 ++++++++++++ .../org/apache/cassandra/io/util/FileUtils.java | 8 -------- 4 files changed, 14 insertions(+), 9 deletions(-) ----------------------------------------------------------------------
