Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: src/java/org/apache/cassandra/service/StorageService.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/08fd11dc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/08fd11dc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/08fd11dc Branch: refs/heads/cassandra-2.1 Commit: 08fd11dc1dd37079fcc265c5a5a048910f699f76 Parents: 948ae01 b40cb05 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Wed Jul 30 16:54:49 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Wed Jul 30 16:54:49 2014 -0500 ---------------------------------------------------------------------- .../cassandra/service/StorageService.java | 45 +------------------- 1 file changed, 2 insertions(+), 43 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/08fd11dc/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------