Repository: struts Updated Branches: refs/heads/master e0003f047 -> 294394b25
Merge pull request #1 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/7170c135 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/7170c135 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/7170c135 Branch: refs/heads/master Commit: 7170c13509611284b100521968163698e96708b9 Parents: 0e11112 110d63f Author: victor sosa <victors...@users.noreply.github.com> Authored: Mon Jan 4 18:06:23 2016 -0400 Committer: victor sosa <victors...@users.noreply.github.com> Committed: Mon Jan 4 18:06:23 2016 -0400 ---------------------------------------------------------------------- .../opensymphony/xwork2/util/CompoundRoot.java | 9 +++++--- plugins/jasperreports/pom.xml | 4 ++-- .../jasperreports/JasperReportsResult.java | 2 +- .../org/apache/struts2/json/JSONResult.java | 2 +- .../org/apache/struts2/json/JSONResultTest.java | 24 ++++++++++---------- .../struts2/rest/DefaultHttpHeadersTest.java | 16 +++++++++---- 6 files changed, 34 insertions(+), 23 deletions(-) ----------------------------------------------------------------------
