You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by ms...@apache.org on 2015/01/14 12:05:48 UTC
[2/2] portals-pluto git commit: Merge branch 'master' into PortletHub
Merge branch 'master' into PortletHub
Project: http://git-wip-us.apache.org/repos/asf/portals-pluto/repo
Commit: http://git-wip-us.apache.org/repos/asf/portals-pluto/commit/da05d7bd
Tree: http://git-wip-us.apache.org/repos/asf/portals-pluto/tree/da05d7bd
Diff: http://git-wip-us.apache.org/repos/asf/portals-pluto/diff/da05d7bd
Branch: refs/heads/PortletHub
Commit: da05d7bddd2cbc14c050d8398d10821e840d560c
Parents: 5a5bdb7 018036b
Author: Scott Nicklous <ms...@apache.org>
Authored: Wed Jan 14 12:04:57 2015 +0100
Committer: Scott Nicklous <ms...@apache.org>
Committed: Wed Jan 14 12:04:57 2015 +0100
----------------------------------------------------------------------
.../portlets/TestModule3_Portlet1.java | 24 +++--
.../src/main/webapp/WEB-INF/portlet.xml | 7 ++
.../portlets/TestModule3_Portlet2.java | 108 +++++++++++--------
.../src/main/webapp/WEB-INF/portlet.xml | 7 ++
.../tck/beans/TestModule3Definitions.java | 39 ++++---
5 files changed, 118 insertions(+), 67 deletions(-)
----------------------------------------------------------------------