diff options
| author | Erlang/OTP <[email protected]> | 2013-01-07 12:00:33 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2013-01-07 12:00:33 +0100 |
| commit | 47c5ff4d3f33af0a4fa7b6952a7066efcbdd82e5 (patch) | |
| tree | e488f7753c3a343fa57ab0a21f606d0e3dda23e3 /lib | |
| parent | 3c05d3389f8b45e5b9f13a874de53ec521981a41 (diff) | |
| parent | 014f575ad684a2cf78925b839634ae6f90bb02e2 (diff) | |
| download | otp-47c5ff4d3f33af0a4fa7b6952a7066efcbdd82e5.tar.gz otp-47c5ff4d3f33af0a4fa7b6952a7066efcbdd82e5.tar.bz2 otp-47c5ff4d3f33af0a4fa7b6952a7066efcbdd82e5.zip | |
Merge branch 'fredrik/ssh/appup-r15b03-patch' into maint-r15
* fredrik/ssh/appup-r15b03-patch:
Fixed syntax appup ssh
Teach Win installer to handle redist on w2012/w8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/common_test/vsn.mk | 2 | ||||
| -rw-r--r-- | lib/ssh/src/ssh.appup.src | 20 |
2 files changed, 4 insertions, 18 deletions
diff --git a/lib/common_test/vsn.mk b/lib/common_test/vsn.mk index 6869c08636..f9bb22867e 100644 --- a/lib/common_test/vsn.mk +++ b/lib/common_test/vsn.mk @@ -1 +1 @@ -COMMON_TEST_VSN = 1.6.3.1 +COMMON_TEST_VSN = 1.6.3 diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src index 6ba32e018f..d99931c746 100644 --- a/lib/ssh/src/ssh.appup.src +++ b/lib/ssh/src/ssh.appup.src @@ -19,28 +19,14 @@ {"%VSN%", [ - {<<"2.1.1">>, [{restart_application, ssh}]}, - {<<"2.1">>, [{load_module, ssh_sftpd_file_api, soft_purge, soft_purge, []}, - {load_module, ssh_connection, soft_purge, soft_purge, []}, - {load_module, ssh_connection_manager, soft_purge, soft_purge, []}, - {load_module, ssh_auth, soft_purge, soft_purge, []}, - {load_module, ssh_connection_handler, soft_purge, soft_purge, []}, - {load_module, ssh_channel, soft_purge, soft_purge, []}, - {load_module, ssh_file, soft_purge, soft_purge, []}]}, - {load_module, ssh, soft_purge, soft_purge, []}]}, + {<<"2.1.1">>, [{restart_application, ssh}]}, + {<<"2.1">>, [{restart_application, ssh}]}, {<<"2.0\\.*">>, [{restart_application, ssh}]}, {<<"1\\.*">>, [{restart_application, ssh}]} ], [ {<<"2.1.1">>, [{restart_application, ssh}]}, - {<<"2.1">>,[{load_module, ssh_sftpd_file_api, soft_purge, soft_purge, []}, - {load_module, ssh_connection, soft_purge, soft_purge, []}, - {load_module, ssh_connection_manager, soft_purge, soft_purge, []}, - {load_module, ssh_auth, soft_purge, soft_purge, []}, - {load_module, ssh_connection_handler, soft_purge, soft_purge, []}, - {load_module, ssh_channel, soft_purge, soft_purge, []}, - {load_module, ssh_file, soft_purge, soft_purge, []}]}, - {load_module, ssh, soft_purge, soft_purge, []}]}, + {<<"2.1">>,[{restart_application, ssh}]}, {<<"2.0\\.*">>, [{restart_application, ssh}]}, {<<"1\\.*">>, [{restart_application, ssh}]} ] |