Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos into alias_validation
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/8a7f7812 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/8a7f7812 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/8a7f7812 Branch: refs/heads/master Commit: 8a7f781224205294d41f0f66db9f9679850197e9 Parents: 0f9a07e 7c68d22 Author: Isuru <[email protected]> Authored: Tue Feb 11 12:47:58 2014 +0530 Committer: Isuru <[email protected]> Committed: Tue Feb 11 12:47:58 2014 +0530 ---------------------------------------------------------------------- .gitignore | 3 + .../cloud/controller/pojo/CartridgeConfig.java | 10 + .../cloud/controller/pojo/CartridgeInfo.java | 10 + .../definition/CartridgeDefinitionBean.java | 2 + .../bean/util/converter/PojoConverter.java | 3 + .../main/resources/CloudControllerService.wsdl | 604 ++++++++++--------- 6 files changed, 331 insertions(+), 301 deletions(-) ----------------------------------------------------------------------
