You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2016/01/05 15:29:14 UTC

[20/20] cassandra git commit: Merge branch 'cassandra-3.3' into trunk

Merge branch 'cassandra-3.3' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0bc2744e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0bc2744e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0bc2744e

Branch: refs/heads/trunk
Commit: 0bc2744e461197203f5aaab643cea39aa11c912a
Parents: 72464ec afcb167
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Jan 5 15:27:38 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Jan 5 15:27:38 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 .../cassandra/locator/PendingRangeMaps.java     | 209 +++++++++++++++++++
 .../test/microbench/PendingRangesBench.java     |  89 ++++++++
 .../cassandra/locator/PendingRangeMapsTest.java |  78 +++++++
 4 files changed, 377 insertions(+)
----------------------------------------------------------------------