[struts] branch master updated (3ff6fd8 -> 7530042)

[ya...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

yasserzamani pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git.


    from 3ff6fd8  Merge pull request #280 from sepe81/travis-after_success
     add 54031d2  Minor update to Struts 2.6 SecurityMemberAccess.
     new 7530042  Merge pull request #282 from JCgH4164838Gh792C124B5/localS2Branch

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../opensymphony/xwork2/ognl/SecurityMemberAccess.java  | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

[struts] 01/01: Merge pull request #282 from JCgH4164838Gh792C124B5/localS2Branch

[ya...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

yasserzamani pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git

commit 7530042ead8013205569e9a8fe7a66ca3cc927a0
Merge: 3ff6fd8 54031d2
Author: Yasser Zamani <ya...@live.com>
AuthorDate: Sun Nov 25 19:39:42 2018 +0330

    Merge pull request #282 from JCgH4164838Gh792C124B5/localS2Branch
    
    Minor update to Struts 2.6 SecurityMemberAccess.

 .../opensymphony/xwork2/ognl/SecurityMemberAccess.java  | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)