Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dcef7c7e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dcef7c7e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dcef7c7e Branch: refs/heads/trunk Commit: dcef7c7ed9bac3484322ed5b20eaa20d373833e7 Parents: fa36044 90b39dc Author: Jeff Jirsa <[email protected]> Authored: Tue Sep 5 11:59:35 2017 -0700 Committer: Jeff Jirsa <[email protected]> Committed: Tue Sep 5 12:00:25 2017 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/utils/MerkleTree.java | 23 +++++++++---- .../apache/cassandra/utils/MerkleTreeTest.java | 34 ++++++++++++++++++++ 3 files changed, 51 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dcef7c7e/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dcef7c7e/src/java/org/apache/cassandra/utils/MerkleTree.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
