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/2f741cb0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/2f741cb0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/2f741cb0 Branch: refs/heads/master Commit: 2f741cb0e4259348ab0c07244d5165d014e1fd45 Parents: 4c293dd 32796ae Author: rekathiru <[email protected]> Authored: Wed Jan 29 13:42:53 2014 +0530 Committer: rekathiru <[email protected]> Committed: Wed Jan 29 13:42:53 2014 +0530 ---------------------------------------------------------------------- .../src/main/resources/conf/cloud-controller.xml | 2 -- 1 file changed, 2 deletions(-) ----------------------------------------------------------------------
