You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/03/09 07:51:06 UTC
[5/7] stratos git commit: Merge branch 'master' of
https://github.com/apache/stratos
Merge branch 'master' of https://github.com/apache/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/27151ab2
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/27151ab2
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/27151ab2
Branch: refs/heads/master
Commit: 27151ab278eedd0c9ec8a0013b7e2e2c09373a93
Parents: 2ff17d7 7372d03
Author: Dinithi <di...@wso2.com>
Authored: Mon Mar 9 09:18:48 2015 +0530
Committer: Dinithi <di...@wso2.com>
Committed: Mon Mar 9 09:18:48 2015 +0530
----------------------------------------------------------------------
.../OneAfterAnotherAlgorithm.java | 58 +-
.../WeightedOneAfterAnotherAlgorithm.java | 31 -
.../internal/AutoscalerServiceComponent.java | 2 -
.../monitor/cluster/ClusterMonitor.java | 25 -
.../monitor/component/ApplicationMonitor.java | 136 +-
.../autoscaler/pojo/policy/PolicyManager.java | 4 +-
.../autoscaler/registry/RegistryManager.java | 52 +-
.../autoscaler/util/AutoscalerConstants.java | 1 -
.../stratos/autoscaler/util/AutoscalerUtil.java | 35 +-
.../agent/test/JavaCartridgeAgentTest.java | 5 +-
.../stratos/cli/RestCommandLineService.java | 2 +-
.../cloud/controller/domain/AppType.java | 3 +-
.../cloud/controller/domain/Cartridge.java | 69 +-
.../controller/domain/CartridgeConfig.java | 46 +-
.../cloud/controller/domain/CartridgeInfo.java | 47 +-
.../domain/CartridgeInstanceData.java | 120 -
.../cloud/controller/domain/MemberContext.java | 11 +
.../controller/domain/NetworkPartition.java | 9 +
.../publisher/StatisticsDataPublisher.java | 215 --
.../publisher/TopologyEventPublisher.java | 1 +
.../messaging/topology/TopologyBuilder.java | 13 +-
.../impl/CloudControllerServiceImpl.java | 25 +-
.../impl/CloudControllerServiceUtil.java | 4 +-
.../services/impl/InstanceCreator.java | 4 +-
.../publisher/BAMUsageDataPublisher.java | 213 ++
.../controller/util/CloudControllerUtil.java | 25 +-
.../common/beans/cartridge/CartridgeBean.java | 93 +-
.../beans/partition/NetworkPartitionBean.java | 9 +
.../common/beans/partition/PartitionBean.java | 9 -
.../beans/partition/PartitionRefBean.java | 10 +-
.../policy/deployment/DeploymentPolicyBean.java | 10 +-
.../common/constants/StratosConstants.java | 1 -
.../common/domain/LoadBalancingIPType.java | 27 +
.../load/balancer/common/domain/Service.java | 8 +-
...LoadBalancerCommonTopologyEventReceiver.java | 104 +-
.../LoadBalancerStatisticsReader.java | 2 +-
.../LoadBalancerStatisticsNotifier.java | 56 +-
.../common/topology/TopologyProvider.java | 4 +-
.../balancer/extension/api/LoadBalancer.java | 3 +-
.../extension/api/LoadBalancerExtension.java | 126 +-
.../TenantAwareLoadBalanceEndpoint.java | 55 +-
.../internal/LoadBalancerServiceComponent.java | 22 +-
.../LoadBalancerStatisticsCollector.java | 3 +-
.../console/applications_form.jag | 66 +-
.../console/configure_form.jag | 4 +-
.../applications/application_requests.jag | 8 +-
.../applications/applicationpolicies.json | 17 +
.../applications/applicationpolicies.json | 69 +
.../schema/configure/deploymentpolicies.json | 3 +
.../forms/schema/configure/partitions.json | 12 +-
.../console/controllers/menu/menu.json | 9 +
.../console/controllers/rest/rest_calls.jag | 32 +-
.../css/custom/application_group_editor.css | 3 +-
.../console/themes/theme0/css/custom/style.css | 4 +
.../theme0/js/custom/applications-deploy.js | 4 +-
.../theme0/js/custom/applications-editor.js | 19 +-
.../js/custom/applications_group_editor.js | 2 +-
.../theme0/partials/applications_deploy.hbs | 25 +-
.../theme0/partials/applications_editor.hbs | 1 +
.../theme0/partials/applications_form.hbs | 71 +
.../theme0/renderers/applications_form.js | 3 +
.../messaging/domain/topology/Member.java | 11 +-
.../event/topology/MemberCreatedEvent.java | 15 +-
.../topology/MemberCreatedMessageProcessor.java | 2 +-
.../mock/iaas/services/impl/MockInstance.java | 22 +-
.../test/PythonCartridgeAgentTest.java | 5 +-
.../rest/endpoint/api/StratosApiV40Utils.java | 17 -
.../rest/endpoint/api/StratosApiV41Utils.java | 12 +-
.../stratos/rest/endpoint/mock/MockContext.java | 10 +-
.../util/converter/ObjectConverter.java | 35 +-
.../haproxy-extension/src/main/assembly/bin.xml | 1 +
.../src/main/bin/haproxy-extension.sh | 7 +-
.../src/main/conf/jndi.properties | 9 +-
.../src/main/conf/log4j.properties | 2 +-
.../src/main/conf/thrift-client-config.xml | 25 +
.../stratos/haproxy/extension/Constants.java | 10 -
.../stratos/haproxy/extension/HAProxy.java | 38 +-
.../haproxy/extension/HAProxyConfigWriter.java | 106 +-
.../haproxy/extension/HAProxyContext.java | 4 -
.../extension/HAProxyStatisticsReader.java | 49 +-
.../apache/stratos/haproxy/extension/Main.java | 29 +-
.../src/main/templates/haproxy.cfg.template | 6 +-
products/stratos/conf/jndi.properties | 1 +
products/stratos/conf/thrift-client-config.xml | 26 +-
.../distribution/src/main/conf/jndi.properties | 2 -
.../tests/SampleApplicationsTest.java | 7 +
.../application-policy-1.json | 10 +-
.../application-policy-2.json | 8 -
.../application-policy-3.json | 19 +
.../artifacts/application-policy.json | 8 -
.../artifacts/autoscaling-policy.json | 14 -
.../artifacts/deployment-policy.json | 15 -
.../artifacts/network-partition.json | 15 -
.../sample-cartridges/scripts/common/deploy.sh | 2 -
.../artifacts/application-policy.json | 8 -
.../artifacts/autoscaling-policy.json | 14 -
.../artifacts/deployment-policy.json | 15 -
.../artifacts/network-partition.json | 15 -
.../sample-groups/scripts/common/deploy.sh | 11 +-
samples/cartridges/kubernetes/php.json | 3 +-
samples/cartridges/kubernetes/tomcat.json | 3 +-
.../deployment-policy-1.json | 4 +-
.../deployment-policy-2.json | 8 +-
.../deployment-policy-3.json | 4 +-
.../deployment-policy-4.json | 8 +-
.../kubernetes/network-partition-1.json | 2 +-
.../kubernetes/network-partition-2.json | 2 +-
.../kubernetes/network-partition-3.json | 2 +-
.../mock/network-partition-1.json | 2 +-
.../mock/network-partition-2.json | 3 +-
.../mock/network-partition-3.json | 2 +-
.../openstack/network-partition-1.json | 2 +-
.../openstack/network-partition-2.json | 2 +-
.../main/resources/CloudControllerService.wsdl | 2427 +++++++++---------
.../modules/python_agent/manifests/init.pp | 2 +-
115 files changed, 2569 insertions(+), 2562 deletions(-)
----------------------------------------------------------------------