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/5576c0c5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/5576c0c5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/5576c0c5 Branch: refs/heads/master Commit: 5576c0c5dc75eef6b324b5d274de7837df59062e Parents: 61e732d 6932793 Author: Nirmal Fernando <[email protected]> Authored: Sat Mar 22 10:40:50 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Sat Mar 22 10:40:50 2014 +0530 ---------------------------------------------------------------------- .../cartridge/agent/RepositoryFileListener.java | 8 +- .../git/impl/GitBasedArtifactRepository.java | 90 +---- .../publisher/HealthStatisticsNotifier.java | 22 +- .../agent/util/CartridgeAgentUtils.java | 17 +- .../cloud/controller/iaases/AWSEC2Iaas.java | 16 +- .../controller/iaases/OpenstackNovaIaas.java | 18 +- .../impl/CloudControllerServiceImpl.java | 5 +- .../cloud/controller/pojo/IaasConfig.java | 17 + .../cloud/controller/pojo/IaasProvider.java | 20 ++ .../cloud/controller/pojo/NetworkInterface.java | 101 ++++++ .../controller/pojo/NetworkInterfaces.java | 53 +++ .../util/CloudControllerConstants.java | 5 +- .../controller/util/CloudControllerUtil.java | 5 + .../balancer/cache/AlgorithmContextCache.java | 10 +- .../manager/CartridgeSubscriptionManager.java | 24 +- .../CartridgeSubscriptionDataPublisher.java | 169 ++++++++++ .../manager/utils/CartridgeConstants.java | 23 +- .../cartridge/definition/IaasProviderBean.java | 19 +- .../definition/NetworkInterfaceBean.java | 51 +++ .../bean/util/converter/PojoConverter.java | 22 ++ .../resources/conf/scripts/sh/customization | 1 + .../src/main/conf/cartridge-config.properties | 4 + .../main/resources/CloudControllerService.wsdl | 325 ++++++++++--------- tools/puppet3-agent/init-vcloud.sh | 80 +++++ 24 files changed, 818 insertions(+), 287 deletions(-) ----------------------------------------------------------------------
