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/3cab0ed7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/3cab0ed7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/3cab0ed7 Branch: refs/heads/master Commit: 3cab0ed7348ea7c79324a821a7f02ae49873b74b Parents: b1ff16b 8195f22 Author: rekathiru <[email protected]> Authored: Fri Jan 10 15:03:06 2014 +0530 Committer: rekathiru <[email protected]> Committed: Fri Jan 10 15:03:06 2014 +0530 ---------------------------------------------------------------------- .../health/AutoscalerHealthStatReceiver.java | 217 +++++++++++++------ .../manager/CartridgeSubscriptionManager.java | 6 +- service-stubs/pom.xml | 2 +- 3 files changed, 154 insertions(+), 71 deletions(-) ----------------------------------------------------------------------
