Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/86b32704 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/86b32704 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/86b32704 Branch: refs/heads/trunk Commit: 86b32704b4e1cac8552461224a6dfd24e11b4df7 Parents: d2c67a1 742e5ba Author: Vijay Parthasarathy <vijay2...@gmail.com> Authored: Sat Sep 14 16:08:18 2013 -0700 Committer: Vijay Parthasarathy <vijay2...@gmail.com> Committed: Sat Sep 14 16:08:18 2013 -0700 ---------------------------------------------------------------------- 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 | 29 ++++++++++++++++++++ 5 files changed, 65 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/86b32704/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/86b32704/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java ----------------------------------------------------------------------
