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/73d01a44 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/73d01a44 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/73d01a44 Branch: refs/heads/master Commit: 73d01a44452485d809b8b9466813d333fa012e78 Parents: 192133f 302244d Author: Udara Liyanage <[email protected]> Authored: Fri Feb 21 10:20:25 2014 -0500 Committer: Udara Liyanage <[email protected]> Committed: Fri Feb 21 10:20:25 2014 -0500 ---------------------------------------------------------------------- .../topology/AutoscalerTopologyReceiver.java | 52 ++++++-- .../autoscaler/rule/RuleTasksDelegator.java | 2 +- .../stratos/cartridge/agent/CartridgeAgent.java | 7 +- .../publisher/HealthStatisticsReader.java | 32 ++++- .../stratos/cli/RestCommandLineService.java | 84 ++++++++++++ .../apache/stratos/cli/StratosApplication.java | 3 + .../stratos/cli/beans/TenantInfoBean.java | 28 ++++ .../stratos/cli/commands/ListAllTenants.java | 65 ++++++++++ .../stratos/cli/commands/PartitionCommand.java | 1 - .../apache/stratos/cli/utils/CliConstants.java | 5 + .../controller/iaases/OpenstackNovaIaas.java | 1 + .../impl/CloudControllerServiceImpl.java | 10 +- .../controller/topology/TopologyBuilder.java | 4 +- .../validate/AWSEC2PartitionValidator.java | 7 +- .../OpenstackNovaPartitionValidator.java | 7 +- .../apache/stratos/common/util/CommonUtil.java | 6 +- .../balancer/LoadBalancerTenantReceiver.java | 7 +- .../balancer/LoadBalancerTopologyReceiver.java | 7 +- .../controllers/cartridgeSubscribeSubmit.jag | 10 ++ .../partials/configure_stratos_wizard.hbs | 52 +++++--- .../theme1/partials/subscribe_cartridge.hbs | 11 +- .../themes/theme1/renderers/cartridges.js | 2 + .../console/themes/theme1/renderers/index.js | 3 +- .../theme1/renderers/tenant_management.js | 3 +- .../manager/client/AutoscalerServiceClient.java | 12 ++ .../manager/payload/BasicPayloadData.java | 23 ++++ .../manager/utils/CartridgeConstants.java | 2 + .../messaging/domain/topology/MemberStatus.java | 19 ++- .../topology/TopologyMessageProcessorChain.java | 3 + .../rest/endpoint/services/ServiceUtils.java | 6 +- .../rest/endpoint/services/StratosAdmin.java | 2 +- .../main/autoscale-policies/economyPolicy.xml | 20 +-- .../distribution/src/main/conf/log4j.properties | 17 +-- .../src/main/conf/cartridge-config.properties | 3 + tools/puppet/agent/root/bin/ec2_init.sh | 128 +++++++++++-------- tools/stratos-installer/conf/setup.conf | 4 + .../repository/conf/cartridge-config.properties | 2 + tools/stratos-installer/setup.sh | 14 ++ 38 files changed, 528 insertions(+), 136 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/73d01a44/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/73d01a44/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/OpenstackNovaIaas.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/73d01a44/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java ----------------------------------------------------------------------
