Return-Path: X-Original-To: apmail-tomee-commits-archive@www.apache.org Delivered-To: apmail-tomee-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 43FD7184A8 for ; Mon, 2 Nov 2015 22:20:59 +0000 (UTC) Received: (qmail 29852 invoked by uid 500); 2 Nov 2015 22:20:59 -0000 Delivered-To: apmail-tomee-commits-archive@tomee.apache.org Received: (qmail 29795 invoked by uid 500); 2 Nov 2015 22:20:59 -0000 Mailing-List: contact commits-help@tomee.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tomee.apache.org Delivered-To: mailing list commits@tomee.apache.org Received: (qmail 29549 invoked by uid 99); 2 Nov 2015 22:20:59 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Nov 2015 22:20:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E9B3BE0544; Mon, 2 Nov 2015 22:20:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: andygumbrecht@apache.org To: commits@tomee.apache.org Date: Mon, 02 Nov 2015 22:21:05 -0000 Message-Id: <2af6a7a0d9974c5fa24961a4eb976055@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [8/8] tomee git commit: Merge remote-tracking branch 'refs/remotes/origin/master' into tomee-7.0.0-M1 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: andygumbrecht@apache.org Authored: Mon Nov 2 23:19:16 2015 +0100 Committer: andygumbrecht@apache.org 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(-) ----------------------------------------------------------------------