Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/f56e254b Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/f56e254b Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/f56e254b Branch: refs/heads/master Commit: f56e254b48e8c19a83496e3480f95dc27ca75b22 Parents: 39355ad 0ca6239 Author: Isuru <[email protected]> Authored: Tue Jan 14 12:34:35 2014 +0530 Committer: Isuru <[email protected]> Committed: Tue Jan 14 12:34:35 2014 +0530 ---------------------------------------------------------------------- .../stratos/cartridge/agent/CartridgeAgent.java | 2 +- .../deployment/partition/Partition.java | 13 +++-- .../impl/CloudControllerServiceImpl.java | 45 +++++++++-------- .../controller/util/CloudControllerUtil.java | 17 ++++++- .../console/config/acl.json | 4 ++ .../console/controllers/acs.jag | 4 ++ .../console/util/acl.jag | 53 ++++++++++++++++++++ .../pom.xml | 5 +- 8 files changed, 111 insertions(+), 32 deletions(-) ----------------------------------------------------------------------
