Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d9a03a07 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d9a03a07 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d9a03a07 Branch: refs/heads/trunk Commit: d9a03a07391d56a9795b94dbf872cd796d4a6e07 Parents: 50b08f2 2bc30e4 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Oct 18 14:33:11 2013 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Oct 18 14:33:11 2013 -0500 ---------------------------------------------------------------------- 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/d9a03a07/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------