Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/43d21c38 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/43d21c38 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/43d21c38 Branch: refs/heads/trunk Commit: 43d21c384b4212f8731edfae33142c0a5676c474 Parents: 4c4c432 dee675f Author: Yuki Morishita <yu...@apache.org> Authored: Wed Jun 17 21:58:02 2015 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Wed Jun 17 21:58:02 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 3 +- .../cassandra/service/StorageService.java | 48 +++++++++++++------- 2 files changed, 34 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/43d21c38/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/43d21c38/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
