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/4a0d1caa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4a0d1caa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4a0d1caa Branch: refs/heads/trunk Commit: 4a0d1caa262af3b6f2b6d329e45766b4df845a88 Parents: 52a1069 5d918b8 Author: Joshua McKenzie <[email protected]> Authored: Thu Sep 24 14:47:28 2015 -0700 Committer: Joshua McKenzie <[email protected]> Committed: Thu Sep 24 14:47:28 2015 -0700 ---------------------------------------------------------------------- .../org/apache/cassandra/db/MultiCBuilder.java | 507 ++++++++----------- .../db/rows/UnfilteredRowIterators.java | 4 +- .../cassandra/service/StorageService.java | 10 +- .../cassandra/service/StorageServiceMBean.java | 5 +- .../org/apache/cassandra/tools/NodeProbe.java | 4 +- 5 files changed, 216 insertions(+), 314 deletions(-) ----------------------------------------------------------------------
