codelipenghui commented on pull request #6895: URL: https://github.com/apache/pulsar/pull/6895#issuecomment-638610162
@nicolo-paganin You can merge the master branch into your branch, there are some conflicts fixed on the master branch. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
