Merge branch 'master' into develop
Conflicts:
apps/blank/pom.xml
apps/jboss-blank/pom.xml
apps/mailreader/pom.xml
apps/pom.xml
apps/portlet/pom.xml
apps/rest-showcase/pom.xml
apps/showcase/pom.xml
archetypes/pom.xml
archetypes/struts2-archetype-angularjs/pom.xml
archetypes/struts2-archetype-blank/pom.xml
archetypes/struts2-archetype-convention/pom.xml
archetypes/struts2-archetype-dbportlet/pom.xml
archetypes/struts2-archetype-plugin/pom.xml
archetypes/struts2-archetype-portlet/pom.xml
archetypes/struts2-archetype-starter/pom.xml
assembly/pom.xml
bundles/admin/pom.xml
bundles/demo/pom.xml
bundles/pom.xml
core/pom.xml
plugins/cdi/pom.xml
plugins/codebehind/pom.xml
plugins/config-browser/pom.xml
plugins/convention/pom.xml
plugins/dojo/pom.xml
plugins/dwr/pom.xml
plugins/embeddedjsp/pom.xml
plugins/gxp/pom.xml
plugins/jasperreports/pom.xml
plugins/javatemplates/pom.xml
plugins/jfreechart/pom.xml
plugins/jsf/pom.xml
plugins/json/pom.xml
plugins/junit/pom.xml
plugins/osgi/pom.xml
plugins/oval/pom.xml
plugins/pell-multipart/pom.xml
plugins/plexus/pom.xml
plugins/pom.xml
plugins/portlet-tiles/pom.xml
plugins/portlet/pom.xml
plugins/rest/pom.xml
plugins/sitegraph/pom.xml
plugins/sitemesh/pom.xml
plugins/spring/pom.xml
plugins/struts1/pom.xml
plugins/testng/pom.xml
plugins/tiles/pom.xml
plugins/tiles3/pom.xml
pom.xml
xwork-core/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/63897e83
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/63897e83
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/63897e83
Branch: refs/heads/develop
Commit: 63897e83d98b4844982c2d96c3d20b4216ece28a
Parents: 086c0a0 d2663ce
Author: Lukasz Lenart <lukaszlen...@apache.org>
Authored: Thu May 8 22:06:00 2014 +0200
Committer: Lukasz Lenart <lukaszlen...@apache.org>
Committed: Thu May 8 22:06:00 2014 +0200
----------------------------------------------------------------------
.../struts2/interceptor/CookieInterceptor.java | 45 +++++++++++------
.../interceptor/CookieInterceptorTest.java | 53 ++++++++++++++++++++
2 files changed, 82 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
