Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d5326d4a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d5326d4a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d5326d4a Branch: refs/heads/cassandra-3.0 Commit: d5326d4aa5d1d89d36c0600508323ccf8fa109da Parents: 2800bf1 c26b397 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Fri Dec 18 23:39:09 2015 +0000 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Fri Dec 18 23:39:09 2015 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/commitlog/CommitLogArchiver.java | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d5326d4a/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d5326d4a/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java ----------------------------------------------------------------------