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/ae26aab4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ae26aab4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ae26aab4 Branch: refs/heads/trunk Commit: ae26aab47b1351ebab88b0aa5c7f9c473f39a019 Parents: 11928f7 e706190 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Mon Jul 15 17:08:45 2013 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Mon Jul 15 17:08:45 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/ae26aab4/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
