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/06/25 10:24:54 UTC

[tomee] 01/21: Merge remote-tracking branch 'upstream/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 7c299a634b31087c821b8a6be5cd23ea3420f7a6
Merge: 2af90cf aa0c44a
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Wed Jun 19 10:16:43 2019 +0100

    Merge remote-tracking branch 'upstream/master'

 docs/java-compatibility.adoc                            | 13 +++++++++++++
 .../java/org/apache/tomee/server/composer/TomEE.java    | 17 +++++++++++------
 2 files changed, 24 insertions(+), 6 deletions(-)