Merge branch 'cassandra-1.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/cfc163df Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cfc163df Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cfc163df Branch: refs/heads/trunk Commit: cfc163df0296ae179285281ad9d6ed46ee185b85 Parents: 5556414 7861f17 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Jun 19 10:24:19 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Jun 19 10:24:19 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/cfc163df/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
