Merge pull request #2 from apache/master Merge changes
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/bdc325b0 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/bdc325b0 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/bdc325b0 Branch: refs/heads/master Commit: bdc325b03d17a6ec8bc6f19ecb0f0e9854749502 Parents: cfc6f19 110d63f Author: victor sosa <victors...@users.noreply.github.com> Authored: Mon Jan 4 18:08:24 2016 -0400 Committer: victor sosa <victors...@users.noreply.github.com> Committed: Mon Jan 4 18:08:24 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(-) ----------------------------------------------------------------------
