Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/e50c61e1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/e50c61e1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/e50c61e1 Branch: refs/heads/master Commit: e50c61e11a19b1c87c73b91e93367a7e85c70c68 Parents: f3f2d13 270e3d1 Author: Imesh Gunaratne <[email protected]> Authored: Fri Apr 18 22:44:38 2014 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Fri Apr 18 22:44:38 2014 +0530 ---------------------------------------------------------------------- README.md | 2 +- .../console/LICENSE | 191 ------------------- extensions/cep/stratos-cep-extension/pom.xml | 10 +- products/stratos/modules/distribution/pom.xml | 2 +- .../distribution/src/main/license/LICENSE | 4 +- .../agent/templates/extensions/addons/_php.erb | 2 +- tools/puppet3/modules/lb/LICENSE | 13 -- 7 files changed, 13 insertions(+), 211 deletions(-) ----------------------------------------------------------------------
