[tomcat] branch 8.5.x updated: Fix merge

2020-05-29 Thread markt
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/8.5.x by this push: new 8563619 Fix merge 8563619 is described below comm

[tomcat] branch 8.5.x updated: Fix merge

2020-05-29 Thread markt
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/8.5.x by this push: new 8563619 Fix merge 8563619 is described below comm