You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2014/04/18 10:26:32 UTC

[2/5] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos

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/d4951cc7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/d4951cc7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/d4951cc7

Branch: refs/heads/master
Commit: d4951cc762223a61dd01b2ddaeea8976e2452a64
Parents: 88edc06 4b0367b
Author: M. Isuru Tharanga Chrishantha Perera <is...@apache.org>
Authored: Fri Apr 18 10:17:46 2014 +0530
Committer: M. Isuru Tharanga Chrishantha Perera <is...@apache.org>
Committed: Fri Apr 18 10:17:46 2014 +0530

----------------------------------------------------------------------
 LICENSE                                         |  34 +-
 NOTICE                                          |   2 +-
 .../internal/AutoscalerServerComponent.java     |  16 +-
 .../AutoscalerHealthStatEventReceiver.java      | 763 ++++++++++++++++++
 .../health/AutoscalerHealthStatReceiver.java    | 774 -------------------
 .../AutoscalerTopologyEventReceiver.java        | 494 ++++++++++++
 .../topology/AutoscalerTopologyReceiver.java    | 492 ------------
 .../topology/TopologyEventMessageListener.java  |  53 --
 .../topology/TopologyEventMessageQueue.java     |  38 -
 .../stratos/cartridge/agent/CartridgeAgent.java |  29 +-
 .../extension/api/LoadBalancerExtension.java    |  36 +-
 .../LoadBalancerTenantEventReceiver.java        | 202 +++++
 .../balancer/LoadBalancerTenantReceiver.java    | 210 -----
 .../LoadBalancerTopologyEventReceiver.java      | 208 +++++
 .../balancer/LoadBalancerTopologyReceiver.java  | 208 -----
 .../internal/LoadBalancerServiceComponent.java  |  12 +-
 .../internal/ADCManagementServerComponent.java  |  10 +-
 .../StratosManagerTopologyEventReceiver.java    | 297 +++++++
 .../StratosManagerTopologyReceiver.java         | 322 --------
 .../stat/HealthStatEventMessageDelegator.java   |  14 +-
 .../stat/HealthStatEventMessageListener.java    |   9 +-
 .../stat/HealthStatEventMessageQueue.java       |  17 +-
 .../health/stat/HealthStatEventReceiver.java    |  87 +++
 .../health/stat/HealthStatReceiver.java         |  82 --
 .../InstanceNotifierEventMessageDelegator.java  |  13 +-
 .../InstanceNotifierEventMessageListener.java   |  10 +-
 .../InstanceNotifierEventMessageQueue.java      |  17 +-
 .../InstanceNotifierEventMessageReceiver.java   |  86 ---
 .../notifier/InstanceNotifierEventReceiver.java |  90 +++
 .../tenant/TenantEventMessageDelegator.java     |  14 +-
 .../tenant/TenantEventMessageListener.java      |  10 +-
 .../tenant/TenantEventMessageQueue.java         |  17 +-
 .../receiver/tenant/TenantEventReceiver.java    |  87 +++
 .../message/receiver/tenant/TenantReceiver.java |  83 --
 .../topology/TopologyEventMessageDelegator.java |  27 +-
 .../topology/TopologyEventMessageListener.java  |  17 +-
 .../topology/TopologyEventMessageQueue.java     |  20 +-
 .../topology/TopologyEventReceiver.java         |  87 +++
 .../receiver/topology/TopologyReceiver.java     |  99 ---
 .../resources/web/WEB-INF/tiles/main_defs.xml   |   3 +-
 .../modules/distribution/src/main/notice/NOTICE |   2 +-
 .../distribution/src/main/notice/NOTICE         |   2 +-
 .../distribution/src/main/license/LICENSE       |  48 +-
 .../modules/distribution/src/main/notice/NOTICE |   2 +-
 tools/stratos-installer/setup.sh                |   2 +
 45 files changed, 2501 insertions(+), 2644 deletions(-)
----------------------------------------------------------------------