You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by jo...@apache.org on 2015/06/07 21:04:22 UTC
[3/6] struts git commit: Merge branch 'master' into spring4
Merge branch 'master' into spring4
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/c951b15c
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/c951b15c
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/c951b15c
Branch: refs/heads/master
Commit: c951b15c1cb1f7e8e95690203dab0e91306c7f65
Parents: d788700 9c67e4e
Author: Johannes Geppert <jo...@gmail.com>
Authored: Sun Jun 7 11:55:02 2015 +0200
Committer: Johannes Geppert <jo...@gmail.com>
Committed: Sun Jun 7 11:55:02 2015 +0200
----------------------------------------------------------------------
.../struts2/dispatcher/StreamResultTest.java | 25 +++++++++---------
.../interceptor/FileUploadInterceptorTest.java | 8 +++---
core/src/test/resources/log4j.properties | 27 --------------------
core/src/test/resources/log4j2.xml | 13 ++++++++++
pom.xml | 1 +
xwork-core/pom.xml | 1 +
6 files changed, 31 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/c951b15c/pom.xml
----------------------------------------------------------------------