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/6abe16d3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6abe16d3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6abe16d3 Branch: refs/heads/trunk Commit: 6abe16d36733363709d478a1ab65b9d1ff0cb6a1 Parents: 8b09061 27488a5 Author: Brandon Williams <[email protected]> Authored: Wed Jan 15 16:02:24 2014 -0600 Committer: Brandon Williams <[email protected]> Committed: Wed Jan 15 16:02:24 2014 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StorageService.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6abe16d3/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
