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 2013/06/01 11:32:52 UTC
[02/50] [abbrv] git commit: Merge branch 'S4-122' into dev
Merge branch 'S4-122' into dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-s4/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s4/commit/b7bd5942
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s4/tree/b7bd5942
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s4/diff/b7bd5942
Branch: refs/heads/master
Commit: b7bd59424af5aba0870fe4e296ec50617057f6e4
Parents: 457844d 45da696
Author: Daniel Gómez Ferro <df...@apache.org>
Authored: Tue Mar 5 12:48:03 2013 +0100
Committer: Daniel Gómez Ferro <df...@apache.org>
Committed: Tue Mar 5 12:48:03 2013 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/s4/tools/Deploy.java | 12 +++++++++---
.../src/main/java/org/apache/s4/tools/Package.java | 6 +++++-
2 files changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------