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/f6330b39 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/f6330b39 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/f6330b39 Branch: refs/heads/master Commit: f6330b39db47a28bd5dce3af276575b0bae2da7b Parents: 380ec0d 070fdac Author: Manula Thantriwatte <[email protected]> Authored: Mon Mar 31 11:22:28 2014 +0530 Committer: Manula Thantriwatte <[email protected]> Committed: Mon Mar 31 11:22:28 2014 +0530 ---------------------------------------------------------------------- .../console/themes/theme1/renderers/cartridges.js | 4 ++-- .../console/themes/theme1/renderers/configure_stratos_wizard.js | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
