diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-03-22 09:50:03 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-03-22 09:50:03 +0100 |
| commit | 5d7ed57d07118f95cf970ee655ea8eea76cbe6fd (patch) | |
| tree | c59721c8a811f3185290c0a25d1085b85993ca12 /lib/ssh | |
| parent | 2497698a1715462d8785179eacb9975adb35a767 (diff) | |
| parent | b2b96f8b37143e760cfe6638c6c4b3bd34604e1f (diff) | |
| download | otp-5d7ed57d07118f95cf970ee655ea8eea76cbe6fd.tar.gz otp-5d7ed57d07118f95cf970ee655ea8eea76cbe6fd.tar.bz2 otp-5d7ed57d07118f95cf970ee655ea8eea76cbe6fd.zip | |
Merge remote branch 'upstream/maint'
* upstream/maint:
Prepare for release
Prepare for release
Prepare for release
Diffstat (limited to 'lib/ssh')
| -rw-r--r-- | lib/ssh/src/ssh.appup.src | 26 | ||||
| -rw-r--r-- | lib/ssh/vsn.mk | 2 |
2 files changed, 7 insertions, 21 deletions
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src index 21a0582c06..0542054596 100644 --- a/lib/ssh/src/ssh.appup.src +++ b/lib/ssh/src/ssh.appup.src @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2004-2011. All Rights Reserved. +%% Copyright Ericsson AB 2004-2012. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -18,26 +18,12 @@ %% {"%VSN%", - [ - {"2.0.8", [{load_module, ssh_sftpd_file_api, soft_purge, soft_purge, []}, - {load_module, ssh_channel, soft_purge, soft_purge, []}]}, - {"2.0.7", [{load_module, ssh_sftp, soft_purge, soft_purge, []}]}, - {"2.0.6", [{load_module, ssh_userreg, soft_purge, soft_purge, []}, - {load_module, ssh_sftp, soft_purge, soft_purge, []}]}, - {"2.0.5", [{load_module, ssh_userreg, soft_purge, soft_purge, []}, - {load_module, ssh_sftp, soft_purge, soft_purge, []}, - {load_module, ssh_connection_handler, soft_purge, soft_purge, [ssh_userreg]}]} + [ + {<<"2\\.*">>, [{restart_application, ssh}]}, + {<<"1\\.*">>, [{restart_application, ssh}]} ], [ - {"2.0.8", [{load_module, ssh_sftpd_file_api, soft_purge, soft_purge, []}, - {load_module, ssh_channel, soft_purge, soft_purge, []}]}, - {"2.0.7", [{load_module, ssh_sftp, soft_purge, soft_purge, []}]}, - {"2.0.6", [{load_module, ssh_userreg, soft_purge, soft_purge, []}, - {load_module, ssh_sftp, soft_purge, soft_purge, []}]}, - {"2.0.5", [{load_module, ssh_userreg, soft_purge, soft_purge, []}, - {load_module, ssh_sftp, soft_purge, soft_purge, []}, - {load_module, ssh_connection_handler, soft_purge, soft_purge, [ssh_userreg]}]} + {<<"2\\.*">>, [{restart_application, ssh}]}, + {<<"1\\.*">>, [{restart_application, ssh}]} ] }. - - diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk index 42f860d6ae..bff73a1b40 100644 --- a/lib/ssh/vsn.mk +++ b/lib/ssh/vsn.mk @@ -1,5 +1,5 @@ #-*-makefile-*- ; force emacs to enter makefile-mode -SSH_VSN = 2.0.9 +SSH_VSN = 2.1 APP_VSN = "ssh-$(SSH_VSN)" |