merge changes
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e2cd82b2 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e2cd82b2 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e2cd82b2 Branch: refs/heads/tenant-isolation Commit: e2cd82b2dcc4ed87d6590717fe610f402bc9a060 Parents: a5e75b4 f626185 Author: Dinithi <[email protected]> Authored: Thu Jul 9 14:45:52 2015 +0530 Committer: Dinithi <[email protected]> Committed: Thu Jul 9 14:45:52 2015 +0530 ---------------------------------------------------------------------- .../parser/DefaultApplicationParser.java | 8 +- .../applications/parser/ParserUtils.java | 2 +- .../applications/pojo/CartridgeContext.java | 18 +- .../services/impl/AutoscalerServiceImpl.java | 2 +- .../beans/application/SubscribableInfo.java | 2 + .../rest/endpoint/api/StratosApiV41Utils.java | 4 +- .../util/converter/ObjectConverter.java | 11 +- .../src/main/conf/cipher-tool.properties | 10 +- .../src/main/resources/AutoscalerService.wsdl | 635 ++++++++++--------- 9 files changed, 356 insertions(+), 336 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/e2cd82b2/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/e2cd82b2/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/e2cd82b2/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java ----------------------------------------------------------------------
