diff options
| author | Erlang/OTP <[email protected]> | 2014-09-29 08:59:51 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2014-09-29 08:59:51 +0200 |
| commit | 2f3e63e49d196a733f876ddfab3862fa6ea49c9a (patch) | |
| tree | 9c94c2840a0f62896e6033d52a3a6d112efd427a | |
| parent | e218a4578f0ea24fb846ee433d48df98040ff573 (diff) | |
| parent | b5f7f202e53b18776afe25eaac2d16bad672d10f (diff) | |
| download | otp-2f3e63e49d196a733f876ddfab3862fa6ea49c9a.tar.gz otp-2f3e63e49d196a733f876ddfab3862fa6ea49c9a.tar.bz2 otp-2f3e63e49d196a733f876ddfab3862fa6ea49c9a.zip | |
Merge branch 'ia/ssh/version-appup' into maint-17
* ia/ssh/version-appup:
ssh: ssh-3.0.6 will not support soft ugrade
| -rw-r--r-- | lib/ssh/src/ssh.appup.src | 16 | ||||
| -rw-r--r-- | lib/ssh/vsn.mk | 2 |
2 files changed, 1 insertions, 17 deletions
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src index 8269f89e40..1917c95f5a 100644 --- a/lib/ssh/src/ssh.appup.src +++ b/lib/ssh/src/ssh.appup.src @@ -19,25 +19,9 @@ {"%VSN%", [ - {"3.0.2", [{load_module, ssh_message, soft_purge, soft_purge, []}, - {load_module, ssh_connection_handler, soft_purge, soft_purge, []}, - {load_module, ssh_io, soft_purge, soft_purge, []}]}, - {"3.0.1", [{load_module, ssh, soft_purge, soft_purge, []}, - {load_module, ssh_acceptor, soft_purge, soft_purge, []}, - {load_module, ssh_message, soft_purge, soft_purge, []}, - {load_module, ssh_connection_handler, soft_purge, soft_purge, []}, - {load_module, ssh_io, soft_purge, soft_purge, []}]}, {<<".*">>, [{restart_application, ssh}]} ], [ - {"3.0.2", [{load_module, ssh_message, soft_purge, soft_purge, []}, - {load_module, ssh_connection_handler, soft_purge, soft_purge, []}, - {load_module, ssh_io, soft_purge, soft_purge, []}]}, - {"3.0.1", [{load_module, ssh, soft_purge, soft_purge, []}, - {load_module, ssh_acceptor, soft_purge, soft_purge, []}, - {load_module, ssh_message, soft_purge, soft_purge, []}, - {load_module, ssh_connection_handler, soft_purge, soft_purge, []}, - {load_module, ssh_io, soft_purge, soft_purge, []}]}, {<<".*">>, [{restart_application, ssh}]} ] }. diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk index 73bf73971f..11f30e8d04 100644 --- a/lib/ssh/vsn.mk +++ b/lib/ssh/vsn.mk @@ -1,5 +1,5 @@ #-*-makefile-*- ; force emacs to enter makefile-mode -SSH_VSN = 3.0.5 +SSH_VSN = 3.0.6 APP_VSN = "ssh-$(SSH_VSN)" |