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/dbeb34d4 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/dbeb34d4 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/dbeb34d4 Branch: refs/heads/master Commit: dbeb34d44e19726a83bf7331d68684bcc587f61d Parents: 6e8d614 a03ff6d Author: Dinithi <[email protected]> Authored: Thu May 21 15:01:31 2015 +0530 Committer: Dinithi <[email protected]> Committed: Thu May 21 15:01:31 2015 +0530 ---------------------------------------------------------------------- .../parser/DefaultApplicationParser.java | 2 +- components/org.apache.stratos.cli/pom.xml | 2 +- .../apache/stratos/cli/CommandLineService.java | 524 ------------------- .../java/org/apache/stratos/cli/RestClient.java | 4 +- .../stratos/cli/commands/ListTenants.java | 4 +- .../iaases/kubernetes/KubernetesIaas.java | 26 +- .../client/CloudControllerServiceClient.java | 4 +- .../client/live/AbstractLiveTest.java | 5 +- .../org.apache.stratos.logging.view.ui/pom.xml | 2 +- .../logging/view/ui/LogViewerClient.java | 29 +- .../src/main/resources/web/log-view/index.jsp | 2 +- .../configure/configure_requests.jag | 4 +- .../default/configure/application-policies.json | 6 +- .../schema/configure/application-policies.json | 56 +- .../schema/configure/kubernetes-clusters.json | 63 +-- .../themes/theme0/partials/configure_form.hbs | 4 +- .../manager/utils/PermissionConstants.java | 2 +- .../stratos/manager/utils/UserRoleCreator.java | 2 +- .../rest/endpoint/api/StratosApiV41.java | 6 +- .../rest/endpoint/api/StratosApiV41Utils.java | 40 +- .../pom.xml | 2 +- .../pom.xml | 4 +- .../distribution/src/main/license/LICENSE | 1 - .../distribution/src/main/license/LICENSE | 2 +- .../artifacts/application.json | 2 +- .../kubernetes-cluster-1.json | 8 + 26 files changed, 117 insertions(+), 689 deletions(-) ----------------------------------------------------------------------
