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