Repository: struts Updated Branches: refs/heads/master cd13846e1 -> 6e07a6379
Merge pull request #17 from apache/master update pull Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/7985fd19 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/7985fd19 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/7985fd19 Branch: refs/heads/master Commit: 7985fd191a39921817316f0f71348ffdd8233a4a Parents: ffdacf1 095960b Author: victor sosa <victors...@users.noreply.github.com> Authored: Thu May 26 19:23:37 2016 -0400 Committer: victor sosa <victors...@users.noreply.github.com> Committed: Thu May 26 19:23:37 2016 -0400 ---------------------------------------------------------------------- .../dispatcher/mapper/DefaultActionMapper.java | 2 +- .../mapper/DefaultActionMapperTest.java | 12 +++---- .../apache/struts2/json/JSONInterceptor.java | 26 +++++++------- .../struts2/json/JSONInterceptorTest.java | 37 +++++++++++--------- 4 files changed, 40 insertions(+), 37 deletions(-) ----------------------------------------------------------------------
