Merge remote-tracking branch 'refs/remotes/origin/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/bcb8bf03 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/bcb8bf03 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/bcb8bf03 Branch: refs/heads/tomee-7.0.0-M1 Commit: bcb8bf032bad305ad4d30d7090fdd5d506db69a6 Parents: c99a184 93d2cc0 Author: andygumbre...@apache.org <andy...@gmx.de> Authored: Mon Nov 2 23:19:16 2015 +0100 Committer: andygumbre...@apache.org <andy...@gmx.de> Committed: Mon Nov 2 23:19:16 2015 +0100 ---------------------------------------------------------------------- .../arquillian/remote/RemoteTomEEContainer.java | 8 +++++++- .../arquillian/webapp/TomEEWebappContainer.java | 5 ++++- .../openejb/maven/plugin/AbstractCommandMojo.java | 3 ++- .../openejb/maven/plugin/UpdatableTomEEMojo.java | 4 ++++ .../tomee/catalina/GlobalListenerSupport.java | 2 +- .../org/apache/tomee/catalina/TomcatLoader.java | 1 - .../tomee/jul/handler/rotating/PerfRunner.java | 16 ++++++++++++++++ 7 files changed, 34 insertions(+), 5 deletions(-) ----------------------------------------------------------------------