Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/74bc1cc7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/74bc1cc7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/74bc1cc7 Branch: refs/heads/cassandra-3.0 Commit: 74bc1cc7dd1213d4176cd914274f706342287141 Parents: 8123b3b 92c5787 Author: T Jake Luciani <j...@apache.org> Authored: Thu Oct 1 09:10:37 2015 -0400 Committer: T Jake Luciani <j...@apache.org> Committed: Thu Oct 1 09:10:37 2015 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StorageService.java | 5 +++++ src/java/org/apache/cassandra/service/StorageServiceMBean.java | 4 ++++ 2 files changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/74bc1cc7/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/74bc1cc7/src/java/org/apache/cassandra/service/StorageServiceMBean.java ----------------------------------------------------------------------
