Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/37ca86b9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/37ca86b9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/37ca86b9 Branch: refs/heads/cassandra-3.0 Commit: 37ca86b9469c478c87e8c651eb33389d78ea1edf Parents: a7a0388 b4d3ac4 Author: Sylvain Lebresne <[email protected]> Authored: Fri Dec 11 10:31:38 2015 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Fri Dec 11 10:31:38 2015 +0100 ---------------------------------------------------------------------- .../cassandra/service/StorageService.java | 40 +++++++++++--------- 1 file changed, 22 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/37ca86b9/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
