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/da2acdd6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/da2acdd6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/da2acdd6 Branch: refs/heads/trunk Commit: da2acdd606fca0952ee74d629a5876cfba58b784 Parents: ffc8dae c17dcd4 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue Apr 8 14:42:43 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue Apr 8 14:42:43 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StorageService.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/da2acdd6/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
