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/fcd0aebb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fcd0aebb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fcd0aebb Branch: refs/heads/trunk Commit: fcd0aebb6ec6f7bab267cba952f7a03f1c929512 Parents: 2c65393 3bba32c Author: Vijay Parthasarathy <[email protected]> Authored: Sat Sep 14 17:47:02 2013 -0700 Committer: Vijay Parthasarathy <[email protected]> Committed: Sat Sep 14 17:47:02 2013 -0700 ---------------------------------------------------------------------- NEWS.txt | 2 ++ conf/commitlog_archiving.properties | 7 +++-- .../db/commitlog/CommitLogArchiver.java | 12 ++++++++- .../db/commitlog/CommitLogReplayer.java | 2 +- test/conf/commitlog_archiving.properties | 19 +++++++++++++ .../cassandra/db/RecoveryManagerTest.java | 28 ++++++++++++++++++++ 6 files changed, 66 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fcd0aebb/NEWS.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fcd0aebb/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java ----------------------------------------------------------------------
