Merge branch 'cassandra-3.0' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/89c558a4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/89c558a4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/89c558a4 Branch: refs/heads/cassandra-3.0 Commit: 89c558a43ce13c456e1813a6d96f46d971bf16e8 Parents: 71171bb 2954b18 Author: Yuki Morishita <[email protected]> Authored: Wed Feb 10 17:50:43 2016 -0600 Committer: Yuki Morishita <[email protected]> Committed: Wed Feb 10 17:50:43 2016 -0600 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../dht/tokenallocator/TokenAllocation.java | 4 +- .../apache/cassandra/dht/BootStrapperTest.java | 62 +++++++++++++++++++- 3 files changed, 65 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/89c558a4/CHANGES.txt ----------------------------------------------------------------------
