Merge branch 'patch' of github.com:victorsosa/struts into patch
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/1e21b7ec Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/1e21b7ec Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/1e21b7ec Branch: refs/heads/master Commit: 1e21b7ec1b04af84e31f7136e88663bc670a502e Parents: e2ae94c bdc325b Author: Victor Sosa <victorns...@gmail.com> Authored: Mon Jan 4 18:12:57 2016 -0400 Committer: Victor Sosa <victorns...@gmail.com> Committed: Mon Jan 4 18:12:57 2016 -0400 ---------------------------------------------------------------------- core/pom.xml | 1 - plugins/jasperreports/pom.xml | 4 ++-- .../jasperreports/JasperReportsResult.java | 8 ++++++- .../org/apache/struts2/json/JSONResult.java | 2 +- .../org/apache/struts2/json/JSONResultTest.java | 24 ++++++++++---------- .../struts2/rest/DefaultHttpHeadersTest.java | 16 +++++++++---- 6 files changed, 34 insertions(+), 21 deletions(-) ----------------------------------------------------------------------
