diff options
| author | Hans Nilsson <[email protected]> | 2015-06-30 13:22:07 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2015-06-30 13:22:07 +0200 |
| commit | 2e36a5f144ff1c996f02d5a55b07f3c840869ebf (patch) | |
| tree | 97e92c53cd9dc0ca009538485d5fabb6e04c3c7b /lib/ssh/test/ssh_relay.erl | |
| parent | 3f95bd6b63d4ee585fc3dcc53cd0f214e33762b3 (diff) | |
| parent | 747e32d7e5cfcd580da0a57e94cf9fda7adfb6e3 (diff) | |
| download | otp-2e36a5f144ff1c996f02d5a55b07f3c840869ebf.tar.gz otp-2e36a5f144ff1c996f02d5a55b07f3c840869ebf.tar.bz2 otp-2e36a5f144ff1c996f02d5a55b07f3c840869ebf.zip | |
Merge branch 'hans/ssh/sftp_iolist/OTP-12853' into maint
* hans/ssh/sftp_iolist/OTP-12853:
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} -> []; |