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/b4d3ac40 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b4d3ac40 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b4d3ac40 Branch: refs/heads/cassandra-2.2 Commit: b4d3ac40b3a6221c2b34b765d709bf7408cb39c2 Parents: 4f3e47b 9135340 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Fri Dec 11 10:25:19 2015 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Fri Dec 11 10:25:19 2015 +0100 ---------------------------------------------------------------------- .../cassandra/service/StorageService.java | 40 +++++++++++--------- 1 file changed, 22 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4d3ac40/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
