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/f1e45028 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f1e45028 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f1e45028 Branch: refs/heads/trunk Commit: f1e45028dec2b46691d68e50ed2a565de573411d Parents: a29778a 80355a1 Author: T Jake Luciani <[email protected]> Authored: Thu Oct 1 09:13:18 2015 -0400 Committer: T Jake Luciani <[email protected]> Committed: Thu Oct 1 09:13:18 2015 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StorageService.java | 7 ++++++- .../org/apache/cassandra/service/StorageServiceMBean.java | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
