Merge branch 'cassandra-2.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/b76dc972 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b76dc972 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b76dc972 Branch: refs/heads/cassandra-2.1 Commit: b76dc9727403c6f9ef2eaaf9f990d784b4d2a722 Parents: 4b7161d cc8eeef Author: Jason Brown <jasedbr...@gmail.com> Authored: Tue Oct 14 06:58:46 2014 -0700 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Tue Oct 14 06:58:46 2014 -0700 ---------------------------------------------------------------------- .../cassandra/db/commitlog/CommitLogArchiver.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b76dc972/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java ----------------------------------------------------------------------
