Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/a74b60ec Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/a74b60ec Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/a74b60ec Branch: refs/heads/master Commit: a74b60ec4d7ea96c0693250712258dbcd6b98ea7 Parents: d3ae36c 97926da Author: Imesh Gunaratne <[email protected]> Authored: Wed Nov 20 22:08:38 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Wed Nov 20 22:08:38 2013 +0530 ---------------------------------------------------------------------- .../topology/InstanceSpawnedEventProcessor.java | 2 +- .../main/autoscale-policies/economyPolicy.xml | 60 ++++++++------------ .../deployment-policies/economy-deployment.xml | 59 +++++++++++-------- .../health/publisher/HealthPublisherClient.java | 8 +-- 4 files changed, 63 insertions(+), 66 deletions(-) ----------------------------------------------------------------------
