Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/02c92dfc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/02c92dfc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/02c92dfc Branch: refs/heads/trunk Commit: 02c92dfce322086532462d9a13454f3ba52b1954 Parents: ce6ad5b 8bafc18 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Wed Dec 23 19:11:53 2015 -0500 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Wed Dec 23 19:11:53 2015 -0500 ---------------------------------------------------------------------- .../cassandra/db/commitlog/CommitLogSegmentManager.java | 7 ------- src/java/org/apache/cassandra/repair/Validator.java | 6 ++++-- 2 files changed, 4 insertions(+), 9 deletions(-) ----------------------------------------------------------------------
