Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bde7615c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bde7615c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bde7615c Branch: refs/heads/trunk Commit: bde7615c2f8f8d8f6a8a9be4ca01c02fc9e03e54 Parents: e27e974 b2e4d10 Author: Marcus Eriksson <[email protected]> Authored: Tue Jun 2 17:37:23 2015 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Tue Jun 2 17:37:23 2015 +0200 ---------------------------------------------------------------------- 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/bde7615c/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
