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/a0e97c14 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/a0e97c14 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/a0e97c14 Branch: refs/heads/master Commit: a0e97c1447b57262e6f1f3c1cdedcca3eae14190 Parents: b31f497 d227e6c Author: M. Isuru Tharanga Chrishantha Perera <[email protected]> Authored: Tue Apr 1 00:34:30 2014 +0530 Committer: M. Isuru Tharanga Chrishantha Perera <[email protected]> Committed: Tue Apr 1 00:34:30 2014 +0530 ---------------------------------------------------------------------- .../org.apache.stratos.cloud.controller/pom.xml | 2 +- .../concurrent/PartitionValidatorCallable.java | 88 ++++++++++++++++++++ .../cloud/controller/iaases/AWSEC2Iaas.java | 18 +++- .../impl/CloudControllerServiceImpl.java | 76 +++++++---------- .../controller/registry/RegistryManager.java | 8 +- .../runtime/FasterLookUpDataHolder.java | 17 +++- .../util/CloudControllerConstants.java | 2 +- .../console/subscribe_cartridge.jag | 4 + .../theme1/partials/subscribe_cartridge.hbs | 7 +- .../theme1/renderers/subscribe_cartridge.js | 1 + .../console/util/utility.jag | 4 + dependencies/pom.xml | 1 + products/stratos/conf/jndi.properties | 9 +- products/stratos/modules/distribution/pom.xml | 17 ++++ .../modules/distribution/src/assembly/bin.xml | 8 ++ 15 files changed, 196 insertions(+), 66 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a0e97c14/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/subscribe_cartridge.js ----------------------------------------------------------------------
