diff --git a/releng.control/cc.sh b/releng.control/cc.sh index f30bd1b23be0778ca325fb5f0a126ef4f3ff1fc2..b72eca9afb0d368d6a895937eb8fdc2bef27e57b 100644 --- a/releng.control/cc.sh +++ b/releng.control/cc.sh @@ -28,12 +28,6 @@ export JAVA_HOME=${JAVA_5_HOME} export JETTY_HOME=${CCDIR} -if [ -z $DASHBOARDHOST ] -then - DASHBOARDHOST=$HOSTNAME -fi - -DASHBOARDURL=http://$DASHBOARDHOST:$webport/dashboard -sh ${CCDIR}/cruisecontrol.sh -configfile ${RELENG_CONTROL}/cc_config.xml -jmxport $jmxport -rmiport $rmiport -webport $webport -user $trivialUserName -password $trivialPw -cchome $CCDIR -ccname ${CCNAME} -webapppath ${CCDIR}/webapps/cruisecontrol -jettyxml ${CCDIR}/etc/jetty.xml -dashboardurl $DASHBOARDURL 1>out.txt 2>err.txt & +sh ${CCDIR}/cruisecontrol.sh -configfile ${RELENG_CONTROL}/cc_config.xml -jmxport $jmxport -rmiport $rmiport -webport $webport -user $trivialUserName -password $trivialPw -cchome $CCDIR -ccname ${CCNAME} -webapppath ${CCDIR}/webapps/cruisecontrol -jettyxml ${CCDIR}/etc/jetty.xml 1>out.txt 2>err.txt & diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml index 48e89e5923d4f1457246afa3bb6976fffa41c08d..e833fc2d0b80290a4b30b9a8da47c73f7668a14e 100644 --- a/releng.control/cc_config.xml +++ b/releng.control/cc_config.xml @@ -512,7 +512,7 @@ value="S"/> <property name="buildId" - value="3.1M4"/> + value="3.1M5"/> <property name="buildBranch" value="R3.1"/>