aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/src/ssh.appup.src
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2010-11-01 13:58:26 +0100
committerErlang/OTP <[email protected]>2010-11-01 13:58:26 +0100
commitb93c12e8e0113862be038565fc04e170cfe3c12a (patch)
tree9e0e6cb19f759239cb415050616237a7c2ba5c50 /lib/ssh/src/ssh.appup.src
parent7fce62fb8dfcf964111ce8c3254a41ce450ad0b6 (diff)
parent637dff7790e3f195dff81a7cfb8af468dece8946 (diff)
downloadotp-b93c12e8e0113862be038565fc04e170cfe3c12a.tar.gz
otp-b93c12e8e0113862be038565fc04e170cfe3c12a.tar.bz2
otp-b93c12e8e0113862be038565fc04e170cfe3c12a.zip
Merge branch 'nick/ssh/replaced-deprecated/OTP-8849' into maint-r14
* nick/ssh/replaced-deprecated/OTP-8849: The fix regarding OTP-8849 was not included in the previous version as stated. Move away from using deprecated public_key function pem_to_der.
Diffstat (limited to 'lib/ssh/src/ssh.appup.src')
-rw-r--r--lib/ssh/src/ssh.appup.src2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src
index 619b4b736f..9c806bcd03 100644
--- a/lib/ssh/src/ssh.appup.src
+++ b/lib/ssh/src/ssh.appup.src
@@ -19,9 +19,11 @@
{"%VSN%",
[
+ {"2.0.2", [{load_module, ssh_file, soft_purge, soft_purge, []}]},
{"2.0.1", [{restart_application, ssh}]}
],
[
+ {"2.0.2", [{load_module, ssh_file, soft_purge, soft_purge, []}]},
{"2.0.1", [{restart_application, ssh}]}
]
}.