You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2014/04/24 10:00:22 UTC
[4/4] git commit: Merge remote-tracking branch
'origin/4.0.0-incubating' into 4.0.0-incubating
Merge remote-tracking branch 'origin/4.0.0-incubating' into 4.0.0-incubating
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/e8ffe3d0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/e8ffe3d0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/e8ffe3d0
Branch: refs/heads/4.0.0-incubating
Commit: e8ffe3d0860000fed2cda0aa5bd14cd555da6870
Parents: 039438b 828aa98
Author: Imesh Gunaratne <im...@apache.org>
Authored: Thu Apr 24 13:30:10 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu Apr 24 13:30:10 2014 +0530
----------------------------------------------------------------------
.../haproxy-extension/src/main/assembly/bin.xml | 19 +-
.../haproxy-extension/src/main/license/LICENSE | 480 +++++++++++++++++++
.../haproxy-extension/src/main/notice/NOTICE | 395 +++++++++++++++
.../distribution/src/main/license/LICENSE | 6 +-
.../distribution/src/main/license/LICENSE | 1 -
.../distribution/src/main/license/LICENSE | 1 -
.../distribution/src/main/license/LICENSE | 8 +-
7 files changed, 896 insertions(+), 14 deletions(-)
----------------------------------------------------------------------