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/b17629ca Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b17629ca Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b17629ca Branch: refs/heads/cassandra-2.0 Commit: b17629cafcf17487971eba80f1443c00ad4e25ea Parents: 8d93c1f f4460a5 Author: Brandon Williams <[email protected]> Authored: Tue May 6 16:10:52 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Tue May 6 16:10:52 2014 -0500 ---------------------------------------------------------------------- .../cassandra/service/StorageService.java | 30 ++++++++++++++++++++ 1 file changed, 30 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b17629ca/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
