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/9904c628 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9904c628 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9904c628 Branch: refs/heads/cassandra-3.7 Commit: 9904c628a9c38d72e6fca56b09d5da8c1a84cba1 Parents: 4cdce56 f463fed Author: Josh McKenzie <jmcken...@apache.org> Authored: Mon May 23 18:11:46 2016 -0400 Committer: Josh McKenzie <jmcken...@apache.org> Committed: Mon May 23 18:11:46 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/9904c628/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
