Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/42655387 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/42655387 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/42655387 Branch: refs/heads/trunk Commit: 42655387d761d31208a50d5061896d8f2055f8ca Parents: ed4a7c5 efd3ab1 Author: Ariel Weisberg <aweisb...@apple.com> Authored: Wed May 3 17:08:33 2017 -0400 Committer: Ariel Weisberg <aweisb...@apple.com> Committed: Wed May 3 17:08:33 2017 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/42655387/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/42655387/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
