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/89fb391c Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/89fb391c Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/89fb391c Branch: refs/heads/master Commit: 89fb391c10774a90db965a7dc3f8f8a885f4e67b Parents: b82dbc6 0529464 Author: Isuru <[email protected]> Authored: Thu Jan 9 16:00:54 2014 +0530 Committer: Isuru <[email protected]> Committed: Thu Jan 9 16:00:54 2014 +0530 ---------------------------------------------------------------------- .../rule/AutoscalerRuleEvaluator.java | 52 ++++----- .../stratos/autoscaler/TestRulesPackaged.java | 6 ++ .../stratos/cartridge/agent/CartridgeAgent.java | 9 ++ .../config/CartridgeAgentConfiguration.java | 2 +- .../instance/notifier/InstanceCleanupEvent.java | 7 +- .../distribution/src/main/assembly/bin.xml | 6 ++ .../distribution/src/main/conf/terminateall.drl | 44 ++++++++ .../conf/templates/jndi.properties.template | 3 - .../modules/scripts/ec2/cartridge-agent.sh | 67 +++++------- .../ec2/load-balancer/cartridge-agent.sh | 27 +++-- .../distribution/src/main/assembly/bin.xml | 37 ++++++- .../conf/templates/jndi.properties.template | 3 - .../config/as/repository/conf/jndi.properties | 1 - .../cc/repository/conf/cloud-controller.xml | 2 - .../config/cc/repository/conf/jndi.properties | 1 - .../config/cep/repository/conf/jndi.properties | 26 ++++- .../config/sm/repository/conf/carbon.xml | 17 +++ .../config/sm/repository/conf/jndi.properties | 1 - tools/stratos-installer/resources/userstore.sql | 108 ++++++++++++++++--- 19 files changed, 303 insertions(+), 116 deletions(-) ----------------------------------------------------------------------
