Merge branch 'docker-grouping-merge' of https://git-wip-us.apache.org/repos/asf/stratos into docker-grouping-merge
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f236bdaa Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f236bdaa Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f236bdaa Branch: refs/heads/docker-grouping-merge Commit: f236bdaaeb7c19a0152e413fe2a3ff88f016ff96 Parents: 0ffe7cf 4f170eb Author: Manula Thantriwatte <[email protected]> Authored: Fri Nov 7 06:47:09 2014 +0000 Committer: Manula Thantriwatte <[email protected]> Committed: Fri Nov 7 06:47:09 2014 +0000 ---------------------------------------------------------------------- .../cluster/KubernetesServiceClusterMonitor.java | 2 +- .../deployer/DefaultServiceGroupDeployer.java | 11 +++++++---- .../stratos/rest/endpoint/api/StratosApiV40.java | 2 +- .../main/webapp/api-test/WEB-INF/cxf-servlet.xml | 16 +++++++++++++++- .../src/main/webapp/api/WEB-INF/cxf-servlet.xml | 3 +++ 5 files changed, 27 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
