You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2014/12/03 08:00:09 UTC
[3/3] stratos git commit: Merge branch 'master-instanceid' of
https://github.com/gayangunarathne/stratos
Merge branch 'master-instanceid' of https://github.com/gayangunarathne/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/570d1bc6
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/570d1bc6
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/570d1bc6
Branch: refs/heads/master
Commit: 570d1bc67f2b7b2f94260fc04e1979c22bf372ef
Parents: 868e94c d705ee1
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Wed Dec 3 12:31:16 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Wed Dec 3 12:31:16 2014 +0530
----------------------------------------------------------------------
.../apache/stratos/autoscaler/client/CloudControllerClient.java | 3 ++-
.../org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java | 2 +-
.../controller/services/impl/CloudControllerServiceImpl.java | 1 +
.../cartridgeagent/modules/config/cartridgeagentconfiguration.py | 3 +++
.../cartridgeagent/modules/healthstatspublisher/healthstats.py | 3 +++
.../cartridgeagent/modules/util/cartridgeagentconstants.py | 1 +
6 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/570d1bc6/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
----------------------------------------------------------------------