summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--regress/forwarding.sh2
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 00c74c3e5..e64bf0e75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
3 the necessary functions, not from the openssl version. 3 the necessary functions, not from the openssl version.
4 - (dtucker) [contrib/ssh-copy-id] bz#2117: Use portable operator in test. 4 - (dtucker) [contrib/ssh-copy-id] bz#2117: Use portable operator in test.
5 Patch from cjwatson at debian. 5 Patch from cjwatson at debian.
6 - (dtucker) [regress/forwarding.sh] For (as yet unknown) reason, the
7 forwarding test is extremely slow copying data on some machines so switch
8 back to copying the much smaller ls binary until we can figure out why
9 this is.
6 10
720130602 1120130602
8 - (tim) [Makefile.in] Make Solaris, UnixWare, & OpenServer linkers happy 12 - (tim) [Makefile.in] Make Solaris, UnixWare, & OpenServer linkers happy
diff --git a/regress/forwarding.sh b/regress/forwarding.sh
index 2ba140fee..1c408603c 100644
--- a/regress/forwarding.sh
+++ b/regress/forwarding.sh
@@ -3,6 +3,8 @@
3 3
4tid="local and remote forwarding" 4tid="local and remote forwarding"
5 5
6DATA=/bin/ls${EXEEXT}
7
6start_sshd 8start_sshd
7 9
8base=33 10base=33