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/2c360e60 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2c360e60 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2c360e60 Branch: refs/heads/trunk Commit: 2c360e60c44866299d4a89ac0f0b4c164b0c4eac Parents: 1ae5e01 cab33a6 Author: Yuki Morishita <yu...@apache.org> Authored: Thu Jun 11 09:54:48 2015 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Thu Jun 11 09:54:48 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/service/StorageService.java | 15 +++++++++++++++ 2 files changed, 16 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2c360e60/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2c360e60/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
