You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ch...@apache.org on 2014/04/17 23:22:30 UTC
[1/2] git commit: Fix for STRATOS-618
Repository: incubator-stratos
Updated Branches:
refs/heads/master bccad5be0 -> 4b0367bda
Fix for STRATOS-618
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/790ec576
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/790ec576
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/790ec576
Branch: refs/heads/master
Commit: 790ec5766da31c69b249db0687393c93759cc88f
Parents: a04e657
Author: Chris Snow <ch...@apache.org>
Authored: Thu Apr 17 21:19:53 2014 +0000
Committer: Chris Snow <ch...@apache.org>
Committed: Thu Apr 17 21:19:53 2014 +0000
----------------------------------------------------------------------
tools/stratos-installer/setup.sh | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/790ec576/tools/stratos-installer/setup.sh
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/setup.sh b/tools/stratos-installer/setup.sh
index 3b6179b..8dae806 100755
--- a/tools/stratos-installer/setup.sh
+++ b/tools/stratos-installer/setup.sh
@@ -535,6 +535,8 @@ fi
if [[ ($profile = "default" && $config_mb = "true") ]]; then
echo "Extracting ActiveMQ"
tar -xzf $activemq_pack -C $stratos_path
+ # disable amqp connector to prevent conflicts with openstack
+ sed -r -i -e 's@^(\s*)(<transportConnector name="amqp".*\s*)$@\1<!--\2-->@g' $stratos_path/apache-activemq-5.9.1/conf/activemq.xml
fi
general_setup
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by ch...@apache.org.
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/4b0367bd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/4b0367bd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/4b0367bd
Branch: refs/heads/master
Commit: 4b0367bdaad815b9f0b96f397533b68038aa2993
Parents: 790ec57 bccad5b
Author: Chris Snow <ch...@apache.org>
Authored: Thu Apr 17 21:22:09 2014 +0000
Committer: Chris Snow <ch...@apache.org>
Committed: Thu Apr 17 21:22:09 2014 +0000
----------------------------------------------------------------------
.../internal/AutoscalerServerComponent.java | 16 +-
.../AutoscalerHealthStatEventReceiver.java | 763 ++++++++++++++++++
.../health/AutoscalerHealthStatReceiver.java | 774 -------------------
.../AutoscalerTopologyEventReceiver.java | 494 ++++++++++++
.../topology/AutoscalerTopologyReceiver.java | 502 ------------
.../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 | 216 ------
.../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 ---
37 files changed, 2436 insertions(+), 2632 deletions(-)
----------------------------------------------------------------------