You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@tomee.apache.org by jg...@apache.org on 2019/01/09 11:15:26 UTC

[tomee] 01/02: Merge branch 'master' of github.com:martinfmi/tomee into martinfmi-master

This is an automated email from the ASF dual-hosted git repository.

jgallimore pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git

commit 23f5f453ced8500ec705f5148834c18076e7ce38
Merge: 80c0ee3 15c530a
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Wed Jan 9 10:58:55 2019 +0000

    Merge branch 'master' of github.com:martinfmi/tomee into martinfmi-master

 .../org/apache/tomee/catalina/routing/SimpleRouter.java  | 16 +++++++++++++++-
 .../tomee/jul/handler/rotating/LocalFileHandler.java     |  7 -------
 .../java/org/apache/tomee/loader/TomcatEmbedder.java     | 11 ++++++++++-
 3 files changed, 25 insertions(+), 9 deletions(-)