Merge branch 'master' into tomee-7.0.0-M1
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/ffa109cc Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/ffa109cc Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/ffa109cc Branch: refs/heads/tomee-7.0.0-M1 Commit: ffa109cc3f025298c5148177c45137c8cbc61f8e Parents: 4966cef 06f4b74 Author: AndyGee <andy...@gmx.de> Authored: Wed Dec 2 13:49:26 2015 +0100 Committer: AndyGee <andy...@gmx.de> Committed: Wed Dec 2 13:49:26 2015 +0100 ---------------------------------------------------------------------- .gitattributes | 14 ++++++++++---- .../openejb/core/ivm/naming/LazyObjectReference.java | 2 +- .../apache/tomee/catalina/TomcatWebAppBuilder.java | 6 ++++-- .../main/java/org/apache/tomee/overlay/Deployer.java | 2 +- 4 files changed, 16 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
