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/79e344fc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/79e344fc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/79e344fc Branch: refs/heads/trunk Commit: 79e344fc63dbe60b3817d1eb68cdc6274dbe0d58 Parents: 030ec1f 85514ed Author: Aleksey Yeschenko <alek...@yeschenko.com> Authored: Wed Sep 20 18:45:06 2017 +0100 Committer: Aleksey Yeschenko <alek...@yeschenko.com> Committed: Wed Sep 20 18:45:06 2017 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/service/StorageProxy.java | 25 +++++++++++++------- .../cassandra/service/StorageService.java | 18 +++++++++++--- 3 files changed, 32 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/79e344fc/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/79e344fc/src/java/org/apache/cassandra/service/StorageProxy.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/79e344fc/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