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/34faa854 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/34faa854 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/34faa854 Branch: refs/heads/master Commit: 34faa854cb136d26f4d57d11008d81716c2df567 Parents: 1cd00a7 ffad24a Author: Isuru <[email protected]> Authored: Wed Jan 8 07:37:13 2014 +0000 Committer: Isuru <[email protected]> Committed: Wed Jan 8 07:37:13 2014 +0000 ---------------------------------------------------------------------- .../rule/AutoscalerRuleEvaluator.java | 52 ++++++++++---------- products/autoscaler/modules/integration/pom.xml | 2 +- .../tests/AutoscalerTestServerManager.java | 5 +- .../modules/distribution/src/assembly/bin.xml | 7 +++ .../modules/p2-profile-gen/pom.xml | 25 ++++++++-- 5 files changed, 59 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/34faa854/products/stratos-manager/modules/p2-profile-gen/pom.xml ----------------------------------------------------------------------
