Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d71b59e6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d71b59e6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d71b59e6 Branch: refs/heads/trunk Commit: d71b59e67b0a1bc4fb3ed9a106a4b9b84dcb02b7 Parents: 9cd6823 ab99b8e Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Apr 3 17:55:38 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Apr 3 17:55:38 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StorageService.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d71b59e6/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
