Merge branch 'cassandra-3.3' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/42880616 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/42880616 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/42880616 Branch: refs/heads/trunk Commit: 428806165df6d84969bcdb6caabccbe1b7c87ba0 Parents: 75f7872 d781923 Author: T Jake Luciani <j...@apache.org> Authored: Fri Jan 15 09:48:25 2016 -0500 Committer: T Jake Luciani <j...@apache.org> Committed: Fri Jan 15 09:48:25 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/service/StorageService.java | 103 ++++++++++++------- 2 files changed, 69 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/42880616/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/42880616/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
