According to the request we have fixed the merge conflicts. The result is PR#6327. I am closing this PR, the comment existing here will be all fixed. The discussion is moved to PR#6327.
[ Full content available at: https://github.com/apache/incubator-druid/pull/6235 ] This message was relayed via gitbox.apache.org for [email protected]
