Merge branch 'cassandra-2.0.0' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/988aa316 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/988aa316 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/988aa316 Branch: refs/heads/trunk Commit: 988aa31631f59f2949cde68e4ffd9ddbe24fabe3 Parents: c526131 8ee09f7 Author: Brandon Williams <[email protected]> Authored: Thu Aug 8 13:01:51 2013 -0500 Committer: Brandon Williams <[email protected]> Committed: Thu Aug 8 13:01:51 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StorageService.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) ----------------------------------------------------------------------
