Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/b764cd2d Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/b764cd2d Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/b764cd2d Branch: refs/heads/master Commit: b764cd2debc1eb96555eca7be7adf9c31a9589a3 Parents: ce74516 9e5fbf9 Author: Dakshika Jayathilaka <[email protected]> Authored: Thu Apr 30 18:51:23 2015 +0530 Committer: Dakshika Jayathilaka <[email protected]> Committed: Thu Apr 30 18:51:23 2015 +0530 ---------------------------------------------------------------------- .../forms/default/configure/autoscalingpolicies.json | 1 - .../controllers/forms/default/configure/cartridges.json | 1 - .../forms/schema/configure/autoscalingpolicies.json | 8 -------- .../controllers/forms/schema/configure/cartridges.json | 9 --------- 4 files changed, 19 deletions(-) ----------------------------------------------------------------------
