diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-03-01 14:47:55 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-03-01 14:47:55 +0100 |
| commit | 81e432119a8f47226a4746322c64b0901e7817d9 (patch) | |
| tree | ab3564f98d6bf2cd89e194f6810effac9c0ee2d5 /lib/ssh/test/ssh_echo_server.erl | |
| parent | 8deb96fb1d017307e22d2ab88968b9ef9f1b71d0 (diff) | |
| parent | b51fde1cb2c6cdbc775e0ae9c669e76c83d28b78 (diff) | |
| download | otp-81e432119a8f47226a4746322c64b0901e7817d9.tar.gz otp-81e432119a8f47226a4746322c64b0901e7817d9.tar.bz2 otp-81e432119a8f47226a4746322c64b0901e7817d9.zip | |
Merge branch 'ia/ssh/errorhandling-nonexisting-subsystem/OTP-10714' into maint
* ia/ssh/errorhandling-nonexisting-subsystem/OTP-10714:
ssh: Prepare for upcoming release
ssh: Ctify test doc
ssh: Test and enhance handling of nonexistent subsystem
Diffstat (limited to 'lib/ssh/test/ssh_echo_server.erl')
| -rw-r--r-- | lib/ssh/test/ssh_echo_server.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssh/test/ssh_echo_server.erl b/lib/ssh/test/ssh_echo_server.erl index 007b00c373..315ffecfd7 100644 --- a/lib/ssh/test/ssh_echo_server.erl +++ b/lib/ssh/test/ssh_echo_server.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2005-2012. All Rights Reserved. +%% Copyright Ericsson AB 2005-2013. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -21,7 +21,7 @@ %%% Description: Example ssh server -module(ssh_echo_server). --behaviour(ssh_subsytem). +-behaviour(ssh_daemon_channel). -record(state, { n, id, |