You are viewing a plain text version of this content. The canonical link for it is here.
Posted to s4-commits@incubator.apache.org by mm...@apache.org on 2012/07/05 13:12:06 UTC
[1/2] git commit: Merge branch 'S4-70' into piper
Updated Branches:
refs/heads/piper 6f872878b -> 3da0170c2
Merge branch 'S4-70' into piper
Project: http://git-wip-us.apache.org/repos/asf/incubator-s4/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s4/commit/3da0170c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s4/tree/3da0170c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s4/diff/3da0170c
Branch: refs/heads/piper
Commit: 3da0170c25a02923d8d51488bcfda54abdf772c4
Parents: 6f87287 2296106
Author: Matthieu Morel <mm...@apache.org>
Authored: Thu Jul 5 15:02:05 2012 +0200
Committer: Matthieu Morel <mm...@apache.org>
Committed: Thu Jul 5 15:02:05 2012 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/s4/core/Main.java | 58 +++++++++----
.../src/main/java/org/apache/s4/core/Module.java | 65 ---------------
.../src/main/resources/templates/newApp.README | 8 +-
3 files changed, 45 insertions(+), 86 deletions(-)
----------------------------------------------------------------------