Merge branch 'cassandra-3.0' into cassandra-3.7
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1f60143b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1f60143b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1f60143b Branch: refs/heads/trunk Commit: 1f60143bb7f0df7b15c70481b3381ac18df869a4 Parents: bdb9421 9904c62 Author: Josh McKenzie <jmcken...@apache.org> Authored: Mon May 23 18:12:07 2016 -0400 Committer: Josh McKenzie <jmcken...@apache.org> Committed: Mon May 23 18:12:07 2016 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StorageService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1f60143b/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
