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:09 UTC

[45/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/98396a7f
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/98396a7f
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/98396a7f

Branch: refs/heads/master
Commit: 98396a7f4a0c7e0b2a057c750c0725bf94a453c7
Parents: dc4d2ad c13d21c
Author: Chamila de Alwis <ch...@wso2.com>
Authored: Sat Oct 11 22:01:46 2014 +0530
Committer: Chamila de Alwis <ch...@wso2.com>
Committed: Sat Oct 11 22:01:46 2014 +0530

----------------------------------------------------------------------
 .../apache/stratos/cli/CommandLineService.java  |  12 +-
 .../java/org/apache/stratos/cli/RestClient.java |  12 +-
 .../stratos/cli/RestCommandLineService.java     | 796 +++++--------------
 .../apache/stratos/cli/StratosApplication.java  |  30 +-
 .../cli/commands/ActivateTenantCommand.java     |   6 +-
 .../cli/commands/AddDomainMappingCommand.java   |   6 +-
 .../stratos/cli/commands/AddTenantCommand.java  |   8 +-
 .../stratos/cli/commands/AddUserCommand.java    |   8 +-
 .../cli/commands/AutoscalePolicyCommand.java    |  66 --
 .../AutoscalingPolicyDeploymentCommand.java     | 138 ----
 .../commands/CartridgeDeploymentCommand.java    | 140 ----
 .../cli/commands/DeactivateTenantCommand.java   |   4 +-
 .../cli/commands/DeleteTenantCommand.java       |   4 +-
 .../stratos/cli/commands/DeleteUserCommand.java |   4 +-
 .../DeployAutoscalingPolicyCommand.java         | 138 ++++
 .../cli/commands/DeployCartridgeCommand.java    | 140 ++++
 .../commands/DeployDeploymentPolicyCommand.java | 138 ++++
 .../commands/DeployKubernetesGroupCommand.java  |  16 +-
 .../commands/DeployKubernetesHostCommand.java   |  16 +-
 .../cli/commands/DeployPartitionCommand.java    | 138 ++++
 .../cli/commands/DeployServiceCommand.java      | 139 ++++
 .../DeployServiceDeploymentCommand.java         | 139 ----
 .../cli/commands/DeploymentPolicyCommand.java   |  66 --
 .../DeploymentPolicyDeploymentCommand.java      | 138 ----
 .../DescribeAutoScalingPolicyCommand.java       |   4 +-
 .../cli/commands/DescribeCartridgeCommand.java  |   4 +-
 .../DescribeDeploymentPolicyCommand.java        |   6 +-
 .../cli/commands/DescribePartitionCommand.java  |   4 +-
 .../stratos/cli/commands/ExitCommand.java       |   9 +-
 .../stratos/cli/commands/HelpCommand.java       |   6 +-
 .../stratos/cli/commands/InfoCommand.java       |   4 +-
 .../stratos/cli/commands/ListAllTenants.java    |   4 +-
 .../stratos/cli/commands/ListAllUsers.java      |   4 +-
 .../commands/ListAutoscalePolicyCommand.java    |  66 ++
 .../ListCartridgeSubscriptionsCommand.java      |  95 +++
 .../cli/commands/ListCartridgesCommand.java     |   4 +-
 .../cli/commands/ListDeployServiceCommand.java  |   6 +-
 .../commands/ListDeploymentPolicyCommand.java   |  66 ++
 .../commands/ListKubernetesGroupsCommand.java   |   4 +-
 .../commands/ListKubernetesHostsCommand.java    |   4 +-
 .../stratos/cli/commands/ListMemberCommand.java |  10 +-
 .../cli/commands/ListPartitionCommand.java      |  65 ++
 .../ListSubscribedCartridgesCommand.java        |  10 +-
 .../stratos/cli/commands/PartitionCommand.java  |  65 --
 .../commands/PartitionDeploymentCommand.java    | 138 ----
 .../stratos/cli/commands/PoliciesCommand.java   |  71 --
 .../commands/RemoveDomainMappingCommand.java    |  75 --
 .../cli/commands/SubscribeCartridgeCommand.java | 307 +++++++
 .../stratos/cli/commands/SubscribeCommand.java  | 358 ---------
 .../SubscribedCartridgeInfoCommand.java         | 101 ---
 .../stratos/cli/commands/SyncCommand.java       |  17 +-
 .../UnDeployKubernetesGroupCommand.java         |   6 +-
 .../UndeployCartridgeDefinitionCommand.java     |   4 +-
 .../commands/UndeployKubernetesHostCommand.java |   4 +-
 .../UndeployServiceDefinitionCommand.java       |   4 +-
 .../cli/commands/UnsubscribeCommand.java        |  10 +-
 .../stratos/cli/exception/ErrorWrapper.java     |   4 +-
 .../apache/stratos/cli/utils/CliConstants.java  |   4 +-
 .../org/apache/stratos/cli/utils/CliUtils.java  | 147 ++++
 .../stratos/cli/utils/CommandLineUtils.java     | 147 ----
 .../stratos/kubernetes/client/model/Pod.java    |  23 +
 61 files changed, 1807 insertions(+), 2355 deletions(-)
----------------------------------------------------------------------