You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2015/06/04 11:20:50 UTC
[7/7] stratos git commit: Fixing merge conflicts
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/175a57a7
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/175a57a7
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/175a57a7
Branch: refs/heads/master
Commit: 175a57a7d70f51a1c5d74502090e8dba3b42fdfe
Parents: df472e0
Author: anuruddhal <an...@gmail.com>
Authored: Thu Jun 4 14:42:10 2015 +0530
Committer: anuruddhal <an...@gmail.com>
Committed: Thu Jun 4 14:42:10 2015 +0530
----------------------------------------------------------------------
tools/config-scripts/gce/config.sh | 4 ----
tools/config-scripts/openstack/config.sh | 2 +-
2 files changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/175a57a7/tools/config-scripts/gce/config.sh
----------------------------------------------------------------------
diff --git a/tools/config-scripts/gce/config.sh b/tools/config-scripts/gce/config.sh
index a8daa10..ab75b12 100644
--- a/tools/config-scripts/gce/config.sh
+++ b/tools/config-scripts/gce/config.sh
@@ -91,14 +91,10 @@ if [[ $answer = y ]] ; then
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/*
http://git-wip-us.apache.org/repos/asf/stratos/blob/175a57a7/tools/config-scripts/openstack/config.sh
----------------------------------------------------------------------
diff --git a/tools/config-scripts/openstack/config.sh b/tools/config-scripts/openstack/config.sh
index 880a778..76f04dc 100755
--- a/tools/config-scripts/openstack/config.sh
+++ b/tools/config-scripts/openstack/config.sh
@@ -91,7 +91,7 @@ if [[ $answer = y ]] ; then
/root/bin/puppetinstall/puppetinstall "${ARGS[@]}"
#check for java agent lock file
if [ -e ${LOCKFILE} ]; then
- ${RM} ${LOCKFILE}
+ ${RM} ${LOCKFILE}
fi
${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