diff options
author | Hans Nilsson <[email protected]> | 2015-06-30 13:24:13 +0200 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2015-06-30 13:24:13 +0200 |
commit | d953952d8ee1429ac5637953db1e5c189b55c5fd (patch) | |
tree | cbb09e7d0224860a3b029bb83d021149824212b6 /lib/ssh/test/ssh_relay.erl | |
parent | a5d3618a6e78f22852ed491ceffedfaf5b64a0c3 (diff) | |
parent | 2e36a5f144ff1c996f02d5a55b07f3c840869ebf (diff) | |
download | otp-d953952d8ee1429ac5637953db1e5c189b55c5fd.tar.gz otp-d953952d8ee1429ac5637953db1e5c189b55c5fd.tar.bz2 otp-d953952d8ee1429ac5637953db1e5c189b55c5fd.zip |
Merge branch 'maint'
* maint:
ssh: correct sftp unicode and iolist bug
ssh: new unicode tests
ssh: delete ssh_unicode_SUITE
Diffstat (limited to 'lib/ssh/test/ssh_relay.erl')
-rw-r--r-- | lib/ssh/test/ssh_relay.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssh/test/ssh_relay.erl b/lib/ssh/test/ssh_relay.erl index a4f2bad2e2..28000fbb97 100644 --- a/lib/ssh/test/ssh_relay.erl +++ b/lib/ssh/test/ssh_relay.erl @@ -117,7 +117,7 @@ stop(Srv) -> %% {stop, Reason} %% @end %%-------------------------------------------------------------------- -init([ListenAddr, ListenPort, PeerAddr, PeerPort | Options]) -> +init([ListenAddr, ListenPort, PeerAddr, PeerPort | _Options]) -> IfAddr = case ListenAddr of {0,0,0,0} -> []; |