You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2013/08/12 15:47:13 UTC

[07/10] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos into jclouds-upgrade

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos into jclouds-upgrade


Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/dc1a21ef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/dc1a21ef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/dc1a21ef

Branch: refs/heads/master
Commit: dc1a21eff5e047f4c2e21b9367f2675cff3dc811
Parents: f04cb4a a08913f
Author: Isuru Perera <is...@apache.org>
Authored: Fri Aug 9 14:41:28 2013 +0530
Committer: Isuru Perera <is...@apache.org>
Committed: Fri Aug 9 14:41:28 2013 +0530

----------------------------------------------------------------------
 products/cloud-controller/LICENSE.txt           | 1102 ++++++++++--------
 products/cloud-controller/NOTICE                |    5 +
 .../src/main/conf/loadbalancer.conf             |   64 +-
 .../init_scripts/tomcat/stratos.pem             |   16 -
 .../init_scripts/tomcat/wso2.pem                |   16 +
 tools/ec2-demo-setup/config.sh                  |    5 +-
 tools/ec2-demo-setup/tempconfigs/nodes.pp       |  465 --------
 7 files changed, 632 insertions(+), 1041 deletions(-)
----------------------------------------------------------------------