summaryrefslogtreecommitdiff
path: root/scripts/IceGridAdmin.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2010-01-11 12:41:54 +0100
committerBenoit Foucher <benoit@zeroc.com>2010-01-11 12:41:54 +0100
commiteb94b29454a2e8d2ce459fe23f7205a0a1fe9ae7 (patch)
treeec18df62f959596da3e47049494f730fd6741b9b /scripts/IceGridAdmin.py
parentFixed bug 4596 -- test/Ice/operations cross language tests failing (diff)
downloadice-eb94b29454a2e8d2ce459fe23f7205a0a1fe9ae7.tar.bz2
ice-eb94b29454a2e8d2ce459fe23f7205a0a1fe9ae7.tar.xz
ice-eb94b29454a2e8d2ce459fe23f7205a0a1fe9ae7.zip
- Fixed bug 4594, bumped IceGrid.Node.WaitTime to prevent timeouts on slow VMs
- Fixed bug 4602: added comment in Stream.h
Diffstat (limited to 'scripts/IceGridAdmin.py')
-rw-r--r--scripts/IceGridAdmin.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/IceGridAdmin.py b/scripts/IceGridAdmin.py
index b64b8849833..d67c547000a 100644
--- a/scripts/IceGridAdmin.py
+++ b/scripts/IceGridAdmin.py
@@ -21,7 +21,7 @@ iceGridPort = 12010;
nodeOptions = r' --Ice.Warn.Connections=0' + \
r' --IceGrid.Node.Endpoints=default' + \
- r' --IceGrid.Node.WaitTime=30' + \
+ r' --IceGrid.Node.WaitTime=240' + \
r' --Ice.ProgramName=icegridnode' + \
r' --IceGrid.Node.Trace.Replica=0' + \
r' --IceGrid.Node.Trace.Activator=0' + \