You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ni...@apache.org on 2014/10/11 20:47:01 UTC
[37/50] [abbrv] git commit: Merge remote-tracking branch
'upstream/master'
Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c3551c98
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c3551c98
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c3551c98
Branch: refs/heads/master
Commit: c3551c984be67c7a711d1acbde683e7f11095764
Parents: e78b861 fd0f922
Author: Chamila de Alwis <ch...@wso2.com>
Authored: Sat Oct 11 16:44:23 2014 +0530
Committer: Chamila de Alwis <ch...@wso2.com>
Committed: Sat Oct 11 16:44:23 2014 +0530
----------------------------------------------------------------------
.../autoscaler/KubernetesClusterContext.java | 176 ++-
.../stratos/autoscaler/MemberStatsContext.java | 23 +
.../cloud/controller/CloudControllerClient.java | 62 +-
.../monitor/ClusterMonitorFactory.java | 24 +-
.../monitor/KubernetesClusterMonitor.java | 33 +-
.../KubernetesServiceClusterMonitor.java | 112 +-
.../autoscaler/monitor/VMLbClusterMonitor.java | 6 +-
.../monitor/VMServiceClusterMonitor.java | 5 +-
.../rule/AutoscalerRuleEvaluator.java | 24 +-
.../autoscaler/rule/RuleTasksDelegator.java | 84 ++
.../stratos/cartridge/agent/CartridgeAgent.java | 2 +-
.../config/CartridgeAgentConfiguration.java | 24 +-
.../apache/stratos/cli/GenericRestClient.java | 2 +-
.../java/org/apache/stratos/cli/RestClient.java | 313 ++++--
.../stratos/cli/RestCommandLineService.java | 858 +++++++--------
.../apache/stratos/cli/StratosApplication.java | 8 +-
.../cli/beans/kubernetes/KubernetesGroup.java | 44 +
.../beans/kubernetes/KubernetesGroupList.java | 37 +
.../cli/beans/kubernetes/KubernetesHost.java | 53 +
.../beans/kubernetes/KubernetesHostList.java | 37 +
.../commands/ListKubernetesGroupsCommand.java | 66 ++
.../commands/ListKubernetesHostsCommand.java | 67 ++
.../stratos/cli/commands/SubscribeCommand.java | 48 +
.../UnDeployKubernetesGroupCommand.java | 6 +-
.../stratos/cli/exception/ErrorWrapper.java | 48 +
.../stratos/cli/exception/ExceptionMapper.java | 43 +
.../stratos/cli/utils/CommandLineUtils.java | 33 +
.../controller/axiom/AxiomXpathParserUtil.java | 20 +-
.../concurrent/ScheduledThreadExecutor.java | 78 ++
.../exception/InvalidIaasProviderException.java | 2 -
.../MemberTerminationFailedException.java | 48 +
...inerClusterContextToKubernetesContainer.java | 141 +++
...tainerClusterContextToKubernetesService.java | 64 ++
...erClusterContextToReplicationController.java | 90 ++
.../MemberContextToKubernetesContainer.java | 147 ---
.../MemberContextToKubernetesService.java | 65 --
.../MemberContextToReplicationController.java | 90 --
.../functions/PodToMemberContext.java | 46 +
.../impl/CloudControllerServiceImpl.java | 724 +++++++++----
.../interfaces/CloudControllerService.java | 49 +-
.../internal/CloudControllerDSComponent.java | 30 +-
.../jcloud/ComputeServiceBuilderUtil.java | 1 -
.../pojo/ContainerClusterContext.java | 87 ++
.../cloud/controller/pojo/MemberContext.java | 29 +-
.../runtime/FasterLookUpDataHolder.java | 70 +-
.../controller/util/CloudControllerUtil.java | 14 +-
.../controller/util/PodActivationWatcher.java | 80 ++
.../common/constants/StratosConstants.java | 7 +
.../pom.xml | 2 +-
.../kubernetes/client/KubernetesApiClient.java | 202 ++--
.../KubernetesAPIClientInterface.java | 8 +
.../client/rest/KubernetesResponse.java | 56 +
.../client/rest/KubernetesResponseHandler.java | 66 ++
.../kubernetes/client/rest/RestClient.java | 119 +--
.../pom.xml | 19 +
.../modules/distribution/src/assembly/bin.xml | 22 +-
.../src/main/conf/container-mincheck.drl | 72 ++
.../src/main/conf/container-scaling.drl | 163 +++
.../distribution/src/main/conf/log4j.properties | 6 +-
.../main/resources/CloudControllerService.wsdl | 1003 ++++++++++--------
60 files changed, 3939 insertions(+), 1919 deletions(-)
----------------------------------------------------------------------