cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [6/6] git commit: Merge branch 'cassandra-2.0' into trunk
Date Fri, 13 Sep 2013 16:57:04 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/d141daa2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d141daa2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d141daa2

Branch: refs/heads/trunk
Commit: d141daa202e2fab3b6ef89243e36be14253ced1b
Parents: 76acc80 1daf191
Author: Yuki Morishita <yukim@apache.org>
Authored: Fri Sep 13 11:55:10 2013 -0500
Committer: Yuki Morishita <yukim@apache.org>
Committed: Fri Sep 13 11:55:10 2013 -0500

----------------------------------------------------------------------
 CHANGES.txt                                        |  1 +
 .../apache/cassandra/metrics/StorageMetrics.java   |  3 +++
 .../apache/cassandra/service/CassandraDaemon.java  |  5 ++---
 .../org/apache/cassandra/service/StorageProxy.java | 17 ++++++++---------
 .../apache/cassandra/service/StorageService.java   |  3 ++-
 .../cassandra/service/StorageServiceMBean.java     |  1 +
 6 files changed, 17 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d141daa2/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------

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

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

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


Mime
View raw message