Merge branch 'stratos-4.1.x' of https://git-wip-us.apache.org/repos/asf/stratos into stratos-4.1.x
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/df2abb3c Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/df2abb3c Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/df2abb3c Branch: refs/heads/stratos-4.1.x Commit: df2abb3ca93f47d2a90f5e976ea2564d05437dae Parents: dd765ef b73ff94 Author: Isuru Haththotuwa <[email protected]> Authored: Tue Nov 10 14:36:16 2015 +0530 Committer: Isuru Haththotuwa <[email protected]> Committed: Tue Nov 10 14:36:16 2015 +0530 ---------------------------------------------------------------------- .../KubernetesClusterAlreadyUsedException.java | 49 ++++++++++++++++++++ .../impl/CloudControllerServiceImpl.java | 19 ++++++-- .../src/main/python/cli/cli.py | 5 +- 3 files changed, 65 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/df2abb3c/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java ----------------------------------------------------------------------
