Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5c856997 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5c856997 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5c856997 Branch: refs/heads/cassandra-2.1 Commit: 5c8569976e4ff8892860191644a82a55c4db2253 Parents: 73a07da da3606e Author: Benedict Elliott Smith <[email protected]> Authored: Mon Jun 30 13:02:34 2014 +0100 Committer: Benedict Elliott Smith <[email protected]> Committed: Mon Jun 30 13:02:34 2014 +0100 ---------------------------------------------------------------------- conf/cassandra.yaml | 8 ++ .../org/apache/cassandra/config/Config.java | 8 ++ .../cassandra/config/DatabaseDescriptor.java | 10 +++ .../db/commitlog/AbstractCommitLogService.java | 4 +- .../cassandra/db/commitlog/CommitLog.java | 21 +++++ .../db/commitlog/CommitLogSegmentManager.java | 88 +++++++++++--------- .../org/apache/cassandra/io/util/FileUtils.java | 13 --- .../org/apache/cassandra/db/CommitLogTest.java | 31 +++++++ 8 files changed, 130 insertions(+), 53 deletions(-) ----------------------------------------------------------------------
