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/ea1804c9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ea1804c9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ea1804c9 Branch: refs/heads/master Commit: ea1804c9e521d82b69509e941ac46bd9e30bb5e7 Parents: 4898147 86f4e72 Author: Manula Thantriwatte <[email protected]> Authored: Tue Dec 17 15:04:55 2013 +0530 Committer: Manula Thantriwatte <[email protected]> Committed: Tue Dec 17 15:04:55 2013 +0530 ---------------------------------------------------------------------- .../service/ServiceDeploymentManager.java | 2 ++ .../manager/CartridgeSubscriptionManager.java | 3 ++ .../adc/mgt/payload/BasicPayloadData.java | 37 ++++++++++++++++++-- .../stratos/adc/mgt/payload/PayloadData.java | 18 ++++++---- .../apache/stratos/autoscaler/Constants.java | 15 ++++++-- .../health/HealthEventMessageDelegator.java | 25 +++++++++---- 6 files changed, 82 insertions(+), 18 deletions(-) ----------------------------------------------------------------------
