stratos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From im...@apache.org
Subject [50/50] [abbrv] git commit: Merge remote-tracking branch 'upstream/master'
Date Mon, 27 Oct 2014 14:16:54 GMT
Merge remote-tracking branch 'upstream/master'


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d82fcc53
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d82fcc53
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d82fcc53

Branch: refs/heads/master
Commit: d82fcc5394c5677006f3de7a8ebc6a7d4265d67f
Parents: 75cb994 bfe230a
Author: Chamila de Alwis <chamilad@wso2.com>
Authored: Mon Oct 27 17:59:58 2014 +0530
Committer: Chamila de Alwis <chamilad@wso2.com>
Committed: Mon Oct 27 17:59:58 2014 +0530

----------------------------------------------------------------------
 .../autoscaler/KubernetesClusterContext.java    | 19 +++---
 .../stratos/autoscaler/PartitionContext.java    |  4 +-
 .../impl/CloudControllerServiceImpl.java        |  2 +-
 .../common/constants/StratosConstants.java      |  6 +-
 .../distribution/src/main/conf/autoscaler.xml   | 16 +++--
 .../config/all/repository/conf/autoscaler.xml   | 64 ++++++++++++++------
 6 files changed, 75 insertions(+), 36 deletions(-)
----------------------------------------------------------------------



Mime
View raw message