From commits-return-17810-archive-asf-public=cust-asf.ponee.io@struts.apache.org Fri Mar 16 14:13:32 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id A78E7180608 for ; Fri, 16 Mar 2018 14:13:31 +0100 (CET) Received: (qmail 28097 invoked by uid 500); 16 Mar 2018 13:13:25 -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 28081 invoked by uid 99); 16 Mar 2018 13:13:25 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Mar 2018 13:13:25 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 22DEE80AC7; Fri, 16 Mar 2018 13:13:25 +0000 (UTC) Date: Fri, 16 Mar 2018 13:13:25 +0000 To: "commits@struts.apache.org" Subject: [struts] 01/01: Merge pull request #204 from quaff/master MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: lukaszlenart@apache.org In-Reply-To: <152120600491.24652.15829565564625323457@gitbox.apache.org> References: <152120600491.24652.15829565564625323457@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: struts X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: b39433aaa54bec3b593759a9631f4d38b4d2e7da X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20180316131325.22DEE80AC7@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts.git commit b39433aaa54bec3b593759a9631f4d38b4d2e7da Merge: e2c2ea8 c3d8b47 Author: Lukasz Lenart AuthorDate: Fri Mar 16 14:13:21 2018 +0100 Merge pull request #204 from quaff/master WW-4910 Align OptGroup with Select .../org/apache/struts2/components/ListUIBean.java | 39 +++++++++-------- .../org/apache/struts2/components/OptGroup.java | 2 +- .../main/resources/template/simple/optgroup.ftl | 15 ++++--- .../freemarker/FreemarkerResultMockedTest.java | 49 ++++++++++++++++++++++ .../org/apache/struts2/views/freemarker/select.ftl | 28 +++++++++++++ core/src/test/resources/struts.xml | 6 +++ 6 files changed, 113 insertions(+), 26 deletions(-) -- To stop receiving notification emails like this one, please contact lukaszlenart@apache.org.