Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8d3c08b5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d3c08b5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d3c08b5 Branch: refs/heads/trunk Commit: 8d3c08b599fe703d35dc4899a8fe4effd5b6dd4f Parents: 74c49b6 3fab711 Author: Yuki Morishita <yu...@apache.org> Authored: Mon May 12 17:01:48 2014 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Mon May 12 17:01:48 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StorageService.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d3c08b5/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
