Merge branch '4.0.0-grouping' of https://git-wip-us.apache.org/repos/asf/stratos into 4.0.0-grouping
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/fde396a0 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/fde396a0 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/fde396a0 Branch: refs/heads/4.0.0-grouping Commit: fde396a0327c7b75a59a528026bf76b2d90fef01 Parents: f5ae1b9 961e584 Author: Udara Liyanage <[email protected]> Authored: Wed Oct 15 13:48:04 2014 +0530 Committer: Udara Liyanage <[email protected]> Committed: Wed Oct 15 13:48:04 2014 +0530 ---------------------------------------------------------------------- .../status/checker/StatusChecker.java | 61 ++++++------- .../CompositeApplicationParseTest.java | 52 +++++++++++ .../deployment_script.sh | 36 ++++++++ .../m1-samples/ec2/autoscale-policy.json | 14 +++ .../m1-samples/ec2/deployment-policy.json | 14 +++ .../ec2/m1_single_subsciption_app.json | 19 ++++ .../m1-samples/ec2/p1.json | 10 +++ .../m1-samples/ec2/php-cart.json | 38 ++++++++ .../m1-samples/os/autoscale-policy.json | 14 +++ .../m1-samples/os/deployment-policy.json | 14 +++ .../os/m1_single_subsciption_app.json | 19 ++++ .../m1-samples/os/p1.json | 10 +++ .../m1-samples/os/php-cart.json | 46 ++++++++++ .../samples/ec2/autoscale-policy 2.json | 17 ++++ .../samples/ec2/autoscale-policy.json | 14 +++ .../samples/ec2/deployment-policy 2.json | 14 +++ .../samples/ec2/deployment-policy.json | 14 +++ .../samples/ec2/group1.json | 9 ++ .../samples/ec2/group2.json | 15 ++++ .../samples/ec2/m1_single_subsciption_app.json | 19 ++++ .../samples/ec2/m2_single_subsciption_app.json | 95 ++++++++++++++++++++ .../samples/ec2/mysql.json | 33 +++++++ .../samples/ec2/mytest.json | 33 +++++++ .../samples/ec2/p1.json | 10 +++ .../samples/ec2/php-cart.json | 38 ++++++++ .../samples/ec2/tomcat.json | 33 +++++++ .../samples/os/autoscale-policy.json | 14 +++ .../samples/os/deployment-policy.json | 14 +++ .../samples/os/m1_single_subsciption_app.json | 19 ++++ .../samples/os/p1.json | 10 +++ .../samples/os/php-cart.json | 46 ++++++++++ tools/test.json | 0 32 files changed, 764 insertions(+), 30 deletions(-) ----------------------------------------------------------------------
