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/05/28 16:44:18 UTC

[tomee] 03/03: 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 e4418b721102940f0cc4d80080add44fcbbdba9b
Merge: be0dd01 9f0a54e
Author: Jonathan Gallimore <jg...@tomitribe.com>
AuthorDate: Tue May 28 17:43:59 2019 +0100

    Merge remote-tracking branch 'apache/master'

 .gitignore                                         |  1 +
 .../openejb/assembler/classic/Assembler.java       |  2 ++
 .../classic/DelegatePermissionCollection.java      |  2 +-
 .../openejb/core/entity/EntityContainer.java       |  2 +-
 .../openejb/core/entity/EntityEjbHomeHandler.java  | 10 ++++----
 .../org/apache/openejb/util/ArrayEnumeration.java  | 28 ++++++++++-----------
 .../openejb/web/LightweightWebAppBuilder.java      |  1 +
 .../core/security/SecurityServiceImplTest.java     |  2 +-
 .../openejb/server/httpd/HttpRequestImpl.java      | 29 +++++++++-------------
 9 files changed, 38 insertions(+), 39 deletions(-)