Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c58b11bc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c58b11bc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c58b11bc Branch: refs/heads/trunk Commit: c58b11bc755e9d861d7a8038ebd104bda726d7f9 Parents: b6661ac 71171bb Author: Yuki Morishita <[email protected]> Authored: Wed Feb 10 17:38:01 2016 -0600 Committer: Yuki Morishita <[email protected]> Committed: Wed Feb 10 17:38:01 2016 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/service/StorageService.java | 32 +++++++++++--------- 2 files changed, 19 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c58b11bc/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c58b11bc/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
