Merge branch 'cassandra-3.11' into cassandra-3.X
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ddefb1d8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ddefb1d8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ddefb1d8 Branch: refs/heads/trunk Commit: ddefb1d895f71060236f31cd1e91168d35e436d4 Parents: 707c364 1cafc3c Author: Carl Yeksigian <c...@apache.org> Authored: Tue Dec 13 12:29:11 2016 -0500 Committer: Carl Yeksigian <c...@apache.org> Committed: Tue Dec 13 12:29:11 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/service/StorageService.java | 24 ++++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ddefb1d8/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ddefb1d8/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
