Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7c35cc64 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7c35cc64 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7c35cc64 Branch: refs/heads/master Commit: 7c35cc64bdf0cafb2e51e95a3a5be12618f8a523 Parents: 5447592 2db1eea Author: Udara Liyanage <[email protected]> Authored: Wed Oct 1 18:03:57 2014 +0530 Committer: Udara Liyanage <[email protected]> Committed: Wed Oct 1 18:03:57 2014 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/AutoscalerContext.java | 2 +- .../autoscaler/KubernetesClusterContext.java | 73 ++++--- .../cloud/controller/CloudControllerClient.java | 6 + .../AutoscalerHealthStatEventReceiver.java | 174 +++++++++------- .../AutoscalerTopologyEventReceiver.java | 62 ++++-- .../monitor/AbstractClusterMonitor.java | 21 ++ .../monitor/ClusterMonitorFactory.java | 32 ++- .../monitor/ContainerClusterMonitor.java | 21 ++ .../monitor/DockerServiceClusterMonitor.java | 22 +- .../MemberContextToKubernetesContainer.java | 199 +++++++++---------- .../MemberContextToKubernetesService.java | 37 ++-- .../MemberContextToReplicationController.java | 83 ++++---- .../filter/LBCreationSubscriptionFilter.java | 5 + extensions/cep/stratos-cep-extension/pom.xml | 2 +- .../extension/FaultHandlingWindowProcessor.java | 4 +- 15 files changed, 450 insertions(+), 293 deletions(-) ----------------------------------------------------------------------
