You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2013/09/03 06:29:19 UTC

[2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos

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/f7f2ae09
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/f7f2ae09
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/f7f2ae09

Branch: refs/heads/master
Commit: f7f2ae09843e253ab9d1ad54f286bf7c5cc47f3c
Parents: 930fad8 55cab1e
Author: Udara Liyanage <ud...@wso2.com>
Authored: Tue Sep 3 09:58:49 2013 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Tue Sep 3 09:58:49 2013 +0530

----------------------------------------------------------------------
 products/cloud-controller/LICENSE               |  614 ++++++++
 products/cloud-controller/LICENSE.txt           |  614 --------
 .../distribution/src/main/assembly/bin.xml      |   11 +-
 .../distribution/src/main/license/LICENSE       |  924 ++++++++++++
 .../modules/distribution/src/main/notice/NOTICE |  114 ++
 products/elb/LICENSE.txt                        |  386 -----
 .../distribution/src/main/assembly/bin.xml      |   10 +-
 .../distribution/src/main/license/LICENSE       | 1320 ++++++++++++++++++
 .../modules/distribution/src/main/notice/NOTICE |  777 +++++++++++
 .../modules/distribution/src/assembly/bin.xml   |    9 +-
 .../modules/distribution/src/main/notice/NOTICE |  702 ++++++++++
 .../modules/p2-profile-gen/pom.xml              |    8 +-
 tools/cartridge_create/create_kvm_image.sh      |   23 +-
 13 files changed, 4502 insertions(+), 1010 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f7f2ae09/products/stratos-controller/modules/distribution/src/assembly/bin.xml
----------------------------------------------------------------------