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 <[email protected]> Authored: Thu Apr 24 13:30:10 2014 +0530 Committer: Imesh Gunaratne <[email protected]> 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(-) ----------------------------------------------------------------------
