You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ni...@apache.org on 2013/10/18 12:54:19 UTC
[2/4] git commit: conflict resolution
conflict resolution
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/779fa831
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/779fa831
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/779fa831
Branch: refs/heads/master
Commit: 779fa8312434d64813c012270c269c899c9da0d6
Parents: a7645cd ed5e235
Author: Nirmal Fernando <ni...@apache.org>
Authored: Fri Oct 18 16:12:27 2013 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Fri Oct 18 16:12:27 2013 +0530
----------------------------------------------------------------------
.../stratos/lb/endpoint/EndpointConstants.java | 31 ---
.../TenantLoadBalanceMembershipHandler.java | 208 -----------------
.../lb/endpoint/builder/TopologySyncher.java | 151 ------------
.../manager/ClusterDomainManagerImpl.java | 228 -------------------
.../group/mgt/GroupMgtAgentBuilder.java | 82 -------
.../lb/endpoint/internal/RegistryManager.java | 54 -----
.../endpoint/subscriber/TopologyListener.java | 47 ----
.../stratos/lb/endpoint/util/ConfigHolder.java | 192 ----------------
.../lb/endpoint/util/TopologyConstants.java | 29 ---
.../stratos/lb/endpoint/util/Transformer.java | 41 ----
.../messaging/domain/topology/Topology.java | 4 +
components/pom.xml | 15 +-
features/load-balancer/pom.xml | 1 +
.../pom.xml | 6 +
features/pom.xml | 3 +
.../distribution/src/main/license/LICENSE | 3 +-
16 files changed, 22 insertions(+), 1073 deletions(-)
----------------------------------------------------------------------