Merge branch 'maint'

3 files changed, 12 insertions, 6 deletions

diff --git a/lib/common_test/src/ct_netconfc.erl b/lib/common_test/src/ct_netconfc.erl
index d9c4a962dc..5f8bae89fa 100644
--- a/lib/common_test/src/ct_netconfc.erl
+++ b/lib/common_test/src/ct_netconfc.erl
@@ -1074,12 +1074,18 @@ handle_msg({get_event_streams=Op,Streams,Timeout}, From, State) ->
 
 handle_msg({ssh_cm, _CM, {data, _Ch, _Type, Data}}, State) ->
     handle_data(Data, State);
-handle_msg({ssh_cm, _CM, {closed,_Ch}}, State) ->
-    %% This will happen if the server terminates the connection, as in
-    %% kill-session (or if ssh:close is called from somewhere
+handle_msg({ssh_cm, _CM, _SshCloseMsg}, State) ->
+    %% _SshCloseMsg can probably be one of
+    %% {eof,Ch}
+    %% {exit_status,Ch,Status}
+    %% {exit_signal,Ch,ExitSignal,ErrorMsg,LanguageString}
+    %% {signal,Ch,Signal}
+
+    %% This might e.g. happen if the server terminates the connection,
+    %% as in kill-session (or if ssh:close is called from somewhere
     %% unexpected).
 
-    %%! Log this?? - i.e. as server closing the connection
+    %%! Log this??
     %%! Currently the log will say that the client closed the
     %%! connection - due to terminate/2
 
diff --git a/lib/common_test/vsn.mk b/lib/common_test/vsn.mk
index b94f7f7593..877aa775fd 100644
--- a/lib/common_test/vsn.mk
+++ b/lib/common_test/vsn.mk
@@ -1 +1 @@
-COMMON_TEST_VSN = 1.6.1
+COMMON_TEST_VSN = 1.6.2
diff --git a/lib/test_server/vsn.mk b/lib/test_server/vsn.mk
index a1f4559083..aecf595f3f 100644
--- a/lib/test_server/vsn.mk
+++ b/lib/test_server/vsn.mk
@@ -1 +1 @@
-TEST_SERVER_VSN = 3.5.1
+TEST_SERVER_VSN = 3.5.2