Fixing merge conflicts
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/df472e0c Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/df472e0c Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/df472e0c Branch: refs/heads/master Commit: df472e0cf71d9a70ef62167b16e1ba3f62a59d6e Parents: 39821ee c14c6b1 Author: anuruddhal <[email protected]> Authored: Thu Jun 4 14:39:12 2015 +0530 Committer: anuruddhal <[email protected]> Committed: Thu Jun 4 14:39:12 2015 +0530 ---------------------------------------------------------------------- .../stratos/cloud/controller/iaases/gce/GCEIaas.java | 4 ++-- .../stratos/common/constants/StratosConstants.java | 1 + .../LoadBalancerCommonTopologyEventReceiver.java | 13 +++++++++---- .../load/balancer/conf/LoadBalancerConfiguration.java | 9 ++++++--- .../conf/configurator/TopologyFilterConfigurator.java | 6 ++++++ .../resources/sample/configuration/loadbalancer3.conf | 2 +- .../distribution/src/main/conf/loadbalancer.conf | 1 - tools/config-scripts/gce/config.sh | 8 ++++++++ 8 files changed, 33 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/df472e0c/tools/config-scripts/gce/config.sh ---------------------------------------------------------------------- diff --cc tools/config-scripts/gce/config.sh index 6f03e4e,ab75b12..a8daa10 --- a/tools/config-scripts/gce/config.sh +++ b/tools/config-scripts/gce/config.sh @@@ -90,7 -91,10 +91,14 @@@ if [[ $answer = y ]] ; the ARGS=("-n${NODEID}" "-d${DOMAIN}" "-s${PUPPET_IP}") ${ECHO} "\nRunning puppet installation with arguments: ${ARGS[@]}" /root/bin/puppetinstall/puppetinstall "${ARGS[@]}" ++<<<<<<< HEAD + ${RM} /mnt/apache-stratos-cartridge-agent-4.1.0/wso2carbon.lck ++======= + if [ -e ${LOCKFILE} ]; then + ${RM} ${LOCKFILE} + fi + ++>>>>>>> upstream/master ${GREP} -q '/root/bin/init.sh > /tmp/puppet_log' /etc/rc.local || ${SED} -i 's/exit 0$/\/root\/bin\/init.sh \> \/tmp\/puppet_log\nexit 0/' /etc/rc.local ${RM} -rf /tmp/* ${RM} -rf /var/lib/puppet/ssl/*
