Merge branch 'cassandra-1.2' 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/ab99b8e7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ab99b8e7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ab99b8e7 Branch: refs/heads/cassandra-2.0 Commit: ab99b8e75d3d0dadbb8d464c712aea1abd563c44 Parents: 04fd84c 514ce33 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Apr 3 17:55:29 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Apr 3 17:55:29 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StorageService.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ab99b8e7/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
