paul-rogers edited a comment on pull request #11822: URL: https://github.com/apache/druid/pull/11822#issuecomment-975904641
@jihoonson, thanks much for the review. Resolved merge conflicts. Easiest way was to squash commits and rebase on master. Only the files mentioned in the conflict message above were changed. Did not do a full test run; let's see what the Travis run here tells us. Edit: argh, the conflict message was removed by this latest push. The files were: * `.gitignore` * `core/src/main/java/org/apache/druid/java/util/common/ISE.java` * `integration-tests/src/test/java/org/apache/druid/tests/query/ITSqlCancelTest.java` * `sql/src/test/java/org/apache/druid/sql/http/SqlResourceTest.java` -- 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. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
