Merge cassandra-3.X into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7c0d161b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7c0d161b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7c0d161b Branch: refs/heads/trunk Commit: 7c0d161b90af807616089aa8860d52f8f9f9d1fd Parents: 53731df 699fa9a Author: Benjamin Lerer <b.le...@gmail.com> Authored: Thu Nov 10 21:44:15 2016 +0100 Committer: Benjamin Lerer <b.le...@gmail.com> Committed: Thu Nov 10 21:44:24 2016 +0100 ---------------------------------------------------------------------- .../apache/cassandra/db/commitlog/CommitLogSegmentManagerTest.java | 1 + 1 file changed, 1 insertion(+) ----------------------------------------------------------------------
