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 2018/10/08 14:35:52 UTC

[2/2] tomee git commit: Merge remote-tracking branch 'apache/master'

Merge remote-tracking branch 'apache/master'


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/652420e4
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/652420e4
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/652420e4

Branch: refs/heads/master
Commit: 652420e41429910b65b5d51fd42cbabba7f2350a
Parents: e565f49 f11150f
Author: Jonathan Gallimore <jo...@jrg.me.uk>
Authored: Mon Oct 8 15:35:33 2018 +0100
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Mon Oct 8 15:35:33 2018 +0100

----------------------------------------------------------------------
 .../tomee/catalina/TomcatWebAppBuilder.java     |   9 +-
 .../embedded/ServletContextInjectionTest.java   | 238 +++++++++++++++++++
 2 files changed, 245 insertions(+), 2 deletions(-)
----------------------------------------------------------------------