stratos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From im...@apache.org
Subject [5/6] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos
Date Thu, 05 Jun 2014 07:01:27 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos


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

Branch: refs/heads/master
Commit: c9b32b31f423a59586737c765670b9030c00588e
Parents: d45ad99 50e2d29
Author: Imesh Gunaratne <imesh@apache.org>
Authored: Thu Jun 5 09:07:57 2014 +0530
Committer: Imesh Gunaratne <imesh@apache.org>
Committed: Thu Jun 5 09:07:57 2014 +0530

----------------------------------------------------------------------
 DISCLAIMER                                      |  16 --
 README.md                                       |   6 +-
 .../controller/iaases/OpenstackNovaIaas.java    | 195 ++++++++++++++-----
 .../impl/CloudControllerServiceImpl.java        |  40 ++--
 .../manager/CartridgeSubscriptionManager.java   |  10 +-
 .../stratos/manager/payload/PayloadData.java    |  29 ++-
 .../manager/subscription/SubscriptionData.java  |  18 +-
 .../rest/endpoint/bean/CartridgeInfoBean.java   |  11 ++
 .../bean/util/converter/PojoConverter.java      |   2 +-
 .../rest/endpoint/services/ServiceUtils.java    |  40 +++-
 .../load-balancer/haproxy-extension/README.txt  |   2 +-
 pom.xml                                         |   4 +-
 .../src/main/extensions/mount_volumes.sh        |  53 +++--
 .../distribution/src/main/bin/stratos.sh        |   2 +-
 .../modules/distribution/src/bin/stratos.sh     |   2 +-
 15 files changed, 299 insertions(+), 131 deletions(-)
----------------------------------------------------------------------



Mime
View raw message