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/eb766921 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eb766921 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eb766921 Branch: refs/heads/trunk Commit: eb7669215938f29cfb8230fba0b382742b93bd48 Parents: bcd01f2 594f1c1 Author: Aleksey Yeschenko <alek...@yeschenko.com> Authored: Tue Sep 19 11:18:28 2017 +0100 Committer: Aleksey Yeschenko <alek...@yeschenko.com> Committed: Tue Sep 19 11:18:28 2017 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/DataResolver.java | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb766921/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb766921/src/java/org/apache/cassandra/service/DataResolver.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org