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/a9d64ef8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a9d64ef8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a9d64ef8 Branch: refs/heads/trunk Commit: a9d64ef86a10d7502564bf19dfec79b56d04ad10 Parents: 8ec455d 4dc5d69 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Oct 18 00:22:18 2013 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Oct 18 00:22:18 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/a9d64ef8/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------