Merge branch 'tenant-isolation' of https://github.com/apache/stratos into tenant-isolation-v1
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/4014dc5d Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/4014dc5d Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/4014dc5d Branch: refs/heads/master Commit: 4014dc5d69a6597cd73dfe5a6d5d6487ee4d618b Parents: eb0d28f 2f2debf Author: Dinithi <[email protected]> Authored: Fri Aug 21 10:23:06 2015 +0530 Committer: Dinithi <[email protected]> Committed: Fri Aug 21 10:23:06 2015 +0530 ---------------------------------------------------------------------- .../common/threading/StratosThreadPool.java | 20 +++-- .../iaas/services/impl/MockIaasServiceImpl.java | 2 +- extensions/das/pom.xml | 2 +- .../integration/tests/TopologyHandler.java | 19 ++-- .../application/GroupStartupOrderTest.java | 34 +++++++- .../GroupTerminationBehaviorTest.java | 64 ++++++++++---- .../application-policy-3.json.orig | 18 ---- ...-G123-1-application-update-test-v1.json.orig | 91 -------------------- .../application.json.orig | 89 ------------------- 9 files changed, 109 insertions(+), 230 deletions(-) ----------------------------------------------------------------------
