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/4a748f31 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4a748f31 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4a748f31 Branch: refs/heads/trunk Commit: 4a748f31599b7add59c522e72f0b52d372351041 Parents: 9f83e6a 2a656e6 Author: Jonathan Ellis <[email protected]> Authored: Tue Aug 11 08:36:40 2015 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Tue Aug 11 08:36:40 2015 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/utils/MerkleTrees.java | 4 +++- test/unit/org/apache/cassandra/repair/LocalSyncTaskTest.java | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
