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 2015/04/15 18:53:46 UTC

[09/12] tomee git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tomee

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tomee


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

Branch: refs/heads/master
Commit: 5296d4e65d6dca54470c3eb44d06c9c3472dfc0d
Parents: 6f968ca 7b9f898
Author: Jonathan Gallimore <jo...@jrg.me.uk>
Authored: Wed Apr 15 17:51:18 2015 +0100
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Wed Apr 15 17:51:18 2015 +0100

----------------------------------------------------------------------
 .../arquillian/common/TestClassDiscoverer.java  |  1 +
 .../org/apache/openejb/config/AutoConfig.java   | 31 ++++++++------------
 .../config/BuiltInEnvironmentEntries.java       | 11 +++----
 .../openejb/config/MergeWebappJndiContext.java  |  6 ++++
 4 files changed, 26 insertions(+), 23 deletions(-)
----------------------------------------------------------------------