You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jm...@apache.org on 2015/09/24 23:49:56 UTC
[12/12] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
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 <jm...@apache.org>
Authored: Thu Sep 24 14:47:28 2015 -0700
Committer: Joshua McKenzie <jm...@apache.org>
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(-)
----------------------------------------------------------------------