stratos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From im...@apache.org
Subject [2/2] git commit: Merge remote-tracking branch 'origin/master'
Date Sat, 11 Oct 2014 19:17:24 GMT
Merge remote-tracking branch 'origin/master'


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

Branch: refs/heads/master
Commit: 2e1a5020737a7b6ba99acd5b36b08096bd3699a0
Parents: ba4420e b299559
Author: Imesh Gunaratne <imesh@apache.org>
Authored: Sun Oct 12 00:47:16 2014 +0530
Committer: Imesh Gunaratne <imesh@apache.org>
Committed: Sun Oct 12 00:47:16 2014 +0530

----------------------------------------------------------------------
 .../monitor/ClusterMonitorFactory.java          | 10 ++-
 .../monitor/KubernetesClusterMonitor.java       | 67 +++++++++++++++++++-
 .../autoscaler/rule/RuleTasksDelegator.java     | 31 +++++++--
 .../stratos/messaging/util/Constants.java       |  2 +-
 .../src/main/conf/container-mincheck.drl        | 15 +++--
 .../src/main/conf/container-scaling.drl         | 62 ++++++++++--------
 6 files changed, 146 insertions(+), 41 deletions(-)
----------------------------------------------------------------------



Mime
View raw message