Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/de6f21f5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/de6f21f5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/de6f21f5 Branch: refs/heads/trunk Commit: de6f21f5877d39f99edf9ff1cafaf1de50855905 Parents: 85514ed 2b897d2 Author: Aleksey Yeschenko <alek...@yeschenko.com> Authored: Thu Sep 21 17:02:15 2017 +0100 Committer: Aleksey Yeschenko <alek...@yeschenko.com> Committed: Thu Sep 21 17:02:15 2017 +0100 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/DataResolver.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/de6f21f5/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
