Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 4791D200B51 for ; Mon, 18 Jul 2016 08:01:34 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 42F6C160A6B; Mon, 18 Jul 2016 06:01:34 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 8DC34160A6C for ; Mon, 18 Jul 2016 08:01:33 +0200 (CEST) Received: (qmail 5096 invoked by uid 500); 18 Jul 2016 06:01:30 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 3215 invoked by uid 99); 18 Jul 2016 06:01:29 -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, 18 Jul 2016 06:01:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9D627E08BD; Mon, 18 Jul 2016 06:01:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: lukaszlenart@apache.org To: commits@struts.apache.org Date: Mon, 18 Jul 2016 06:01:42 -0000 Message-Id: <4d3397dad457421ca8f021a79f0c0b78@git.apache.org> In-Reply-To: <9b2447b8a4524a2eb00dfb698b817d4b@git.apache.org> References: <9b2447b8a4524a2eb00dfb698b817d4b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [14/15] struts git commit: Merge remote-tracking branch 'origin/master' into WW-4638 archived-at: Mon, 18 Jul 2016 06:01:34 -0000 Merge remote-tracking branch 'origin/master' into WW-4638 Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/7f28bfd2 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/7f28bfd2 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/7f28bfd2 Branch: refs/heads/master Commit: 7f28bfd2d2b64a7325b3abd9e306c55c11d7f5e1 Parents: 59b0e40 90ab489 Author: victorsosa Authored: Fri Jul 15 08:26:05 2016 -0400 Committer: victorsosa Committed: Fri Jul 15 08:26:05 2016 -0400 ---------------------------------------------------------------------- plugins/embeddedjsp/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------