Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/56348ea7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56348ea7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/56348ea7 Branch: refs/heads/trunk Commit: 56348ea7b7011d3d203d9dfaa0f5f32752771a86 Parents: 787a20f 2acd05d Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue Mar 3 15:15:29 2015 -0800 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Tue Mar 3 15:15:29 2015 -0800 ---------------------------------------------------------------------- conf/commitlog_archiving.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
