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/02/22 14:48:58 UTC

[tomee] 05/10: Merge remote-tracking branch 'apache/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 264bd3604c536b0b52705262603ae9913f1d2376
Merge: ea73c5e ba3ac90
Author: Jonathan Gallimore <jg...@dev.jlpsoftwareltd.net>
AuthorDate: Fri Feb 22 13:21:35 2019 +0000

    Merge remote-tracking branch 'apache/master'

 .../java/org/apache/openejb/cdi/CdiScanner.java    | 12 +++--
 .../openejb/server/cxf/rs/CxfRsHttpListener.java   | 57 ++++++++++++++++------
 .../apache/openejb/server/rest/RESTService.java    |  4 ++
 3 files changed, 54 insertions(+), 19 deletions(-)