You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/11/03 22:00:55 UTC
[8/8] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/931a5186
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/931a5186
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/931a5186
Branch: refs/heads/trunk
Commit: 931a51869cda16f69e9b1ed4e4575c1dcbfb4dd0
Parents: 57b5fb6 fe8e92f
Author: Brandon Williams <br...@apache.org>
Authored: Mon Nov 3 15:00:33 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Nov 3 15:00:33 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/service/StorageService.java | 6 ++++++
.../apache/cassandra/service/StorageServiceMBean.java | 3 +++
src/java/org/apache/cassandra/tools/NodeProbe.java | 5 +++++
src/java/org/apache/cassandra/tools/NodeTool.java | 14 ++++++++++++++
5 files changed, 29 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/931a5186/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/931a5186/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/931a5186/src/java/org/apache/cassandra/service/StorageServiceMBean.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/931a5186/src/java/org/apache/cassandra/tools/NodeProbe.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/931a5186/src/java/org/apache/cassandra/tools/NodeTool.java
----------------------------------------------------------------------