Merge branch 'master' of 
https://git-wip-us.apache.org/repos/asf/incubator-stratos into rest_api


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

Branch: refs/heads/master
Commit: 69843755d6bb5a27ff8a4a7736aa650356b656aa
Parents: fc2ffe2 e9f2990
Author: Isuru <[email protected]>
Authored: Fri Dec 6 11:51:45 2013 +0530
Committer: Isuru <[email protected]>
Committed: Fri Dec 6 11:51:45 2013 +0530

----------------------------------------------------------------------
 .../stratos/messaging/domain/tenant/Tenant.java |   4 +
 .../event/tenant/TenantCreatedEvent.java        |  18 +-
 .../tenant/TenantCreatedMessageProcessor.java   |  36 +-
 .../tenant/TenantRemovedMessageProcessor.java   |  45 +-
 .../tenant/TenantUpdatedMessageProcessor.java   |  45 +-
 tools/stratos-installer/conf/setup.conf         |  31 +-
 .../config/agent/bin/stratos.sh                 | 298 ----------
 .../agent/repository/conf/agent.properties      |  47 --
 .../config/agent/repository/conf/carbon.xml     | 586 -------------------
 .../config/as/repository/conf/carbon.xml        | 586 +++++++++++++++++++
 .../config/as/repository/conf/jndi.properties   |   4 +
 .../stratos-installer/config/elb/bin/stratos.sh | 298 ----------
 .../config/elb/repository/conf/axis2/axis2.xml  | 526 -----------------
 .../conf/datasources/master-datasources.xml     | 109 ----
 .../elb/repository/conf/loadbalancer.conf       |  85 ---
 .../config/lb/repository/conf/axis2/axis2.xml   | 526 +++++++++++++++++
 .../config/lb/repository/conf/loadbalancer.conf | 118 ++++
 tools/stratos-installer/setup.sh                | 174 ++----
 tools/stratos-installer/start-servers.sh        |  36 +-
 19 files changed, 1460 insertions(+), 2112 deletions(-)
----------------------------------------------------------------------


Reply via email to