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/ebd9d0fc Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ebd9d0fc Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ebd9d0fc Branch: refs/heads/master Commit: ebd9d0fc68cd5ff09326db7a213e90d9db879aad Parents: 4b8de0c 027ee09 Author: M. Isuru Tharanga Chrishantha Perera <[email protected]> Authored: Thu Apr 17 12:17:30 2014 +0530 Committer: M. Isuru Tharanga Chrishantha Perera <[email protected]> Committed: Thu Apr 17 12:17:30 2014 +0530 ---------------------------------------------------------------------- .../console/themes/theme1/renderers/configure_stratos.js | 4 ++++ .../config/all/repository/conf/cloud-controller.xml | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
