Merge branch 'docker-integration' of https://git-wip-us.apache.org/repos/asf/stratos into docker-integration
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/53d74525 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/53d74525 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/53d74525 Branch: refs/heads/docker-integration Commit: 53d74525145c0d3a72e3ed8b9340a48aacc04e62 Parents: 81cb3ee c4ad65c Author: sajhak <[email protected]> Authored: Mon Sep 15 18:50:27 2014 +0530 Committer: sajhak <[email protected]> Committed: Mon Sep 15 18:50:27 2014 +0530 ---------------------------------------------------------------------- .../cloud/controller/impl/CloudControllerServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
