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 df...@apache.org on 2013/03/05 11:48:31 UTC

[2/2] git commit: Merge branch 'S4-122' into dev

Updated Branches:
  refs/heads/dev 457844d28 -> b7bd59424


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/dev
Commit: b7bd59424af5aba0870fe4e296ec50617057f6e4
Parents: 457844d 45da696
Author: Daniel Gómez Ferro <df...@apache.org>
Authored: Tue Mar 5 12:48:03 2013 +0100
Committer: Daniel Gó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(-)
----------------------------------------------------------------------