Merge branch 'cassandra-3.0' into cassandra-3.5
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4509934f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4509934f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4509934f Branch: refs/heads/cassandra-3.5 Commit: 4509934f9e73a92ad9d79fbc10b753a73fd9cf98 Parents: 76241eb d479b8d Author: Marcus Eriksson <marc...@apache.org> Authored: Wed Mar 23 14:40:55 2016 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Wed Mar 23 14:40:55 2016 +0100 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StorageService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4509934f/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
