Merge branch 'stratos-4.1.x' of https://git-wip-us.apache.org/repos/asf/stratos into stratos-4.1.x
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/196ffcc1 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/196ffcc1 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/196ffcc1 Branch: refs/heads/stratos-4.1.x Commit: 196ffcc10c2101a0c7475ec3a836873bcc8fffda Parents: 4a25072 5401117 Author: Isuru Haththotuwa <[email protected]> Authored: Sat Nov 21 14:52:28 2015 +0530 Committer: Isuru Haththotuwa <[email protected]> Committed: Sat Nov 21 14:52:28 2015 +0530 ---------------------------------------------------------------------- .../integration/tests/adc/GitHookTestCase.java | 107 ++++++++++++++++--- .../application-policy-1.json | 17 --- .../application-policy-git-hook-test.json | 17 +++ .../git-hook-test/applications/application.json | 25 ----- .../applications/git-hook-test.json | 25 +++++ .../autoscaling-policy-1.json | 14 --- .../autoscaling-policy-git-hook-test.json | 14 +++ .../cartridges/mock/c1-git-hook-test.json | 51 +++++++++ .../git-hook-test/cartridges/mock/php.json | 51 --------- .../deployment-policy-1.json | 15 --- .../deployment-policy-git-hook-test.json | 15 +++ .../mock/network-partition-1.json | 15 --- .../mock/network-partition-git-hook-test.json | 15 +++ 13 files changed, 227 insertions(+), 154 deletions(-) ----------------------------------------------------------------------
