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/1c8e9e87 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1c8e9e87 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1c8e9e87 Branch: refs/heads/trunk Commit: 1c8e9e876186c285e8a5716d7739fd0b2487bc3e Parents: aa002bf 05b2ae8 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Wed Apr 2 16:47:06 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Wed Apr 2 16:47:06 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StorageService.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1c8e9e87/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------