cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [6/6] git commit: Merge branch 'cassandra-2.0' into trunk
Date Thu, 29 Aug 2013 04:15:01 GMT
Merge branch 'cassandra-2.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/48ea937b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/48ea937b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/48ea937b

Branch: refs/heads/trunk
Commit: 48ea937b8209936320902df8bd1a63916ee58654
Parents: 5d395b6 8d4b51d
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Wed Aug 28 23:14:47 2013 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Wed Aug 28 23:14:47 2013 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  2 ++
 .../cassandra/locator/EndpointSnitchInfo.java   |  5 ++++
 .../locator/EndpointSnitchInfoMBean.java        |  8 +++++++
 .../apache/cassandra/service/StorageProxy.java  |  5 ++++
 .../cassandra/service/StorageProxyMBean.java    |  6 +++++
 .../cassandra/service/StorageService.java       | 12 ++++++++++
 .../cassandra/service/StorageServiceMBean.java  |  5 ++++
 .../org/apache/cassandra/tools/NodeCmd.java     | 25 ++++++++++++++++++++
 .../org/apache/cassandra/tools/NodeProbe.java   | 10 ++++++++
 .../apache/cassandra/tools/NodeToolHelp.yaml    |  3 +++
 10 files changed, 81 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/48ea937b/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/48ea937b/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/48ea937b/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/48ea937b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
----------------------------------------------------------------------


Mime
View raw message