[struts] branch master updated (ee759d2 -> 45e2dd4)

2018-12-23 Thread amashchenko
This is an automated email from the ASF dual-hosted git repository.

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


from ee759d2  Add generated tag html
 add f9272f8  WW-4938 Reverts dropping injecting internal beans in Spring 
Factory
 new 45e2dd4  Merge pull request #300 from lukaszlenart/WW-4938-fix

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:
 .../main/java/com/opensymphony/xwork2/spring/SpringObjectFactory.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)



[struts] 01/01: Merge pull request #300 from lukaszlenart/WW-4938-fix

2018-12-23 Thread amashchenko
This is an automated email from the ASF dual-hosted git repository.

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

commit 45e2dd4632f9c4aa5fe3711c030cdee51f50baa8
Merge: ee759d2 f9272f8
Author: Aleksandr Mashchenko 
AuthorDate: Sun Dec 23 22:06:46 2018 +0200

Merge pull request #300 from lukaszlenart/WW-4938-fix

[WW-4938] Reverts dropping injecting internal beans in Spring Factory

 .../main/java/com/opensymphony/xwork2/spring/SpringObjectFactory.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)