incubator-s4-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mmo...@apache.org
Subject [2/2] git commit: Merge branch 'S4-111' into dev
Date Fri, 18 Jan 2013 11:46:37 GMT
Updated Branches:
  refs/heads/dev d9e15996f -> 57a3999d3


Merge branch 'S4-111' 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/57a3999d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s4/tree/57a3999d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s4/diff/57a3999d

Branch: refs/heads/dev
Commit: 57a3999d3d944dc6a31babd9ec225ba50dc8310b
Parents: d9e1599 95fd5d6
Author: Matthieu Morel <mmorel@apache.org>
Authored: Fri Jan 18 12:41:23 2013 +0100
Committer: Matthieu Morel <mmorel@apache.org>
Committed: Fri Jan 18 12:41:23 2013 +0100

----------------------------------------------------------------------
 subprojects/s4-core/s4-core.gradle                 |   13 ++
 .../java/org/apache/s4/deploy/HttpS4RFetcher.java  |    2 +-
 .../apache/s4/deploy/TestAutomaticDeployment.java  |   98 ++++++--------
 .../java/org/apache/s4/fixtures/S4RHttpServer.java |   71 ++++++++++
 subprojects/s4-tools/s4-tools.gradle               |    3 +
 .../src/main/java/org/apache/s4/tools/Deploy.java  |   41 +++---
 .../test/java/org/apache/s4/tools/TestDeploy.java  |  109 +++++++++++++++
 7 files changed, 259 insertions(+), 78 deletions(-)
----------------------------------------------------------------------



Mime
View raw message