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/403813c2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/403813c2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/403813c2 Branch: refs/heads/master Commit: 403813c2af3509861a2f24be096c7e1b26a7d497 Parents: b6a7057 9cb5bcb Author: Lahiru Sandaruwan <[email protected]> Authored: Wed Dec 18 16:25:00 2013 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Wed Dec 18 16:25:00 2013 +0530 ---------------------------------------------------------------------- .../stratos/cloud/controller/impl/CloudControllerServiceImpl.java | 2 +- .../apache/stratos/cloud/controller/topology/TopologyBuilder.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
