| commit | 22928109577b5022e730fc8428aeacaf1af62e75 | [log] [tgz] |
|---|---|---|
| author | Michael Blow <michael.blow@couchbase.com> | Tue Nov 26 18:49:55 2019 -0500 |
| committer | Michael Blow <michael.blow@couchbase.com> | Tue Nov 26 18:49:55 2019 -0500 |
| tree | d7617a4e95f03f4e2fff11ca70cb14f612514aa3 | |
| parent | d9a9c14d7df5bffd60417a9d796e641a48008a4c [diff] | |
| parent | e682c94fee4b8135369960dfcc9e2187df75c850 [diff] |
Merge branch 'gerrit/stabilization-f69489' into 'gerrit/mad-hatter' Change-Id: I7eb5133c39ad75e902300cf3fafd943fe253199b
diff --git a/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.bat b/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.bat index 652abff..1d874c2 100644 --- a/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.bat +++ b/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.bat
@@ -108,7 +108,7 @@ start /MIN "cc" cmd /c "echo See output in %LOGSDIR%\cc.log && "%INSTALLDIR%\bin\${CC_COMMAND}" -config-file "%CLUSTERDIR%\conf\cc.conf" >>"%LOGSDIR%\cc.log" 2>&1" echo. -call "%INSTALLDIR%\bin\${HELPER_COMMAND}" wait_for_cluster -timeout 30 +call "%INSTALLDIR%\bin\${HELPER_COMMAND}" wait_for_cluster -timeout 90 if %ERRORLEVEL% EQU 0 ( goto :END )
diff --git a/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh b/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh index 9268bed..34c3a0f 100755 --- a/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh +++ b/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh
@@ -129,5 +129,5 @@ "$INSTALLDIR/bin/${NC_SERVICE_COMMAND}" -logdir - -config-file "$CLUSTERDIR/conf/blue.conf" >> "$LOGSDIR/blue-service.log" 2>&1 & "$INSTALLDIR/bin/${NC_SERVICE_COMMAND}" -logdir - >> "$LOGSDIR/red-service.log" 2>&1 & "$INSTALLDIR/bin/${CC_COMMAND}" -config-file "$CLUSTERDIR/conf/cc.conf" >> "$LOGSDIR/cc.log" 2>&1 & -"$INSTALLDIR/bin/${HELPER_COMMAND}" wait_for_cluster -timeout 30 +"$INSTALLDIR/bin/${HELPER_COMMAND}" wait_for_cluster -timeout 90 exit $?