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/2acd05d9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2acd05d9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2acd05d9 Branch: refs/heads/trunk Commit: 2acd05d96778fc4d4f8ee8cef322f3624638bd8c Parents: 2d1e46e a936d7e Author: Aleksey Yeschenko <[email protected]> Authored: Tue Mar 3 15:14:59 2015 -0800 Committer: Aleksey Yeschenko <[email protected]> Committed: Tue Mar 3 15:14:59 2015 -0800 ---------------------------------------------------------------------- conf/commitlog_archiving.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
