aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/src/ssh.appup.src
diff options
context:
space:
mode:
authorNiclas Eklund <[email protected]>2010-12-10 17:00:02 +0100
committerNiclas Eklund <[email protected]>2010-12-10 17:00:02 +0100
commit8bd0325c850ad70e514f680a2dd7020144773665 (patch)
tree9d8ad2b52391cb54db7fef5c84d0b519c1d48c34 /lib/ssh/src/ssh.appup.src
parent3cf40cefd44ab6383bd16319c7c6941fd0d0f13c (diff)
parentcaa311d4a2b5fb229d9369c7667b062b34945b36 (diff)
downloadotp-8bd0325c850ad70e514f680a2dd7020144773665.tar.gz
otp-8bd0325c850ad70e514f680a2dd7020144773665.tar.bz2
otp-8bd0325c850ad70e514f680a2dd7020144773665.zip
Merge branch 'maint-r13' of super:otp into nick/orber/recursive_types/OTP-8868
Diffstat (limited to 'lib/ssh/src/ssh.appup.src')
-rw-r--r--lib/ssh/src/ssh.appup.src14
1 files changed, 8 insertions, 6 deletions
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src
index 82114c9afd..160e336873 100644
--- a/lib/ssh/src/ssh.appup.src
+++ b/lib/ssh/src/ssh.appup.src
@@ -19,9 +19,10 @@
{"%VSN%",
[
- {"1.1.10", [{load_module, ssh_connection_manager, soft_purge, soft_purge, []}]},
- {"1.1.9", [{load_module, ssh_channel, soft_purge, soft_purge, []},
- {load_module, ssh_connection_manager, soft_purge, soft_purge, []}]},
+ {"1.1.12", [{load_module, ssh_system_sup, soft_purge, soft_purge, []}]},
+ {"1.1.11", [{restart_application, ssh}]},
+ {"1.1.10", [{restart_application, ssh}]},
+ {"1.1.9", [{restart_application, ssh}]},
{"1.1.8", [{restart_application, ssh}]},
{"1.1.7", [{restart_application, ssh}]},
{"1.1.6", [{restart_application, ssh}]},
@@ -31,9 +32,10 @@
{"1.1.2", [{restart_application, ssh}]}
],
[
- {"1.1.10", [{load_module, ssh_connection_manager, soft_purge, soft_purge, []}]},
- {"1.1.9", [{load_module, ssh_channel, soft_purge, soft_purge, []},
- {load_module, ssh_connection_manager, soft_purge, soft_purge, []}]},
+ {"1.1.12", [{load_module, ssh_system_sup, soft_purge, soft_purge, []}]},
+ {"1.1.11", [{restart_application, ssh}]},
+ {"1.1.10", [{restart_application, ssh}]},
+ {"1.1.9", [{restart_application, ssh}]},
{"1.1.8", [{restart_application, ssh}]},
{"1.1.7", [{restart_application, ssh}]},
{"1.1.6", [{restart_application, ssh}]},