Merge branch 'cassandra-3.0' into cassandra-3.5
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ef86d919 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ef86d919 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ef86d919 Branch: refs/heads/trunk Commit: ef86d919250fbc8dc837265c97044eec9de198f9 Parents: 587773f 1dbfa4b Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Fri Mar 18 10:52:14 2016 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Fri Mar 18 10:52:14 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef86d919/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef86d919/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
