summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-11-21 14:24:08 +1100
committerDamien Miller <djm@mindrot.org>2013-11-21 14:24:08 +1100
commitfa7a20bc289f09b334808d988746bc260a2f60c9 (patch)
tree27a40e7718cb5bb0cf324ff0e277e500e4068cd6
parent0fde8acdad78a4d20cadae974376cc0165f645ee (diff)
- naddy@cvs.openbsd.org 2013/11/18 05:09:32
[regress/forward-control.sh] bump timeout to 10 seconds to allow slow machines (e.g. Alpha PC164) to successfully run this; ok djm@ (ID sync only; our timeouts are already longer)
-rw-r--r--ChangeLog4
-rw-r--r--regress/forward-control.sh2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 28186e89f..1f39b76e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,6 +36,10 @@
36 36
37 Feedback markus@, naddy@; manpage bits Loganden Velvindron @ AfriNIC 37 Feedback markus@, naddy@; manpage bits Loganden Velvindron @ AfriNIC
38 ok markus@ naddy@ 38 ok markus@ naddy@
39 - naddy@cvs.openbsd.org 2013/11/18 05:09:32
40 [regress/forward-control.sh]
41 bump timeout to 10 seconds to allow slow machines (e.g. Alpha PC164)
42 to successfully run this; ok djm@
39 43
4020131110 4420131110
41 - (dtucker) [regress/keytype.sh] Populate ECDSA key types to be tested by 45 - (dtucker) [regress/keytype.sh] Populate ECDSA key types to be tested by
diff --git a/regress/forward-control.sh b/regress/forward-control.sh
index 80ddb4167..7f7d105e8 100644
--- a/regress/forward-control.sh
+++ b/regress/forward-control.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: forward-control.sh,v 1.1 2012/12/02 20:47:48 djm Exp $ 1# $OpenBSD: forward-control.sh,v 1.2 2013/11/18 05:09:32 naddy Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="sshd control of local and remote forwarding" 4tid="sshd control of local and remote forwarding"