diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-08-29 09:47:03 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-08-29 09:47:03 +0200 |
| commit | 0080be4a20c094ef45dde842ace64f16d5dc22b2 (patch) | |
| tree | 6ca602f3a8fe82bf13a697365a3b87747c9da1f8 /lib/ssh | |
| parent | e3771bad2cc69658309c88cc4db132f0586933a0 (diff) | |
| parent | 62d63f7bd947a84f5fd21fc76951b05753dbde8e (diff) | |
| download | otp-0080be4a20c094ef45dde842ace64f16d5dc22b2.tar.gz otp-0080be4a20c094ef45dde842ace64f16d5dc22b2.tar.bz2 otp-0080be4a20c094ef45dde842ace64f16d5dc22b2.zip | |
Merge branch 'ia/ssh/prepare-for-release' into maint
* ia/ssh/prepare-for-release:
ssh: Prepare for release
Diffstat (limited to 'lib/ssh')
| -rw-r--r-- | lib/ssh/src/ssh.appup.src | 22 | ||||
| -rw-r--r-- | lib/ssh/vsn.mk | 2 |
2 files changed, 18 insertions, 6 deletions
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src index 0542054596..6967a0f464 100644 --- a/lib/ssh/src/ssh.appup.src +++ b/lib/ssh/src/ssh.appup.src @@ -18,12 +18,24 @@ %% {"%VSN%", - [ - {<<"2\\.*">>, [{restart_application, ssh}]}, - {<<"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_channel, soft_purge, soft_purge, []}, + {load_module, ssh, soft_purge, soft_purge, []}]}, + {<<"2.0\\.*">>, [{restart_application, ssh}]}, + {<<"1\\.*">>, [{restart_application, ssh}]} ], [ - {<<"2\\.*">>, [{restart_application, ssh}]}, - {<<"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_channel, soft_purge, soft_purge, []}, + {load_module, ssh, soft_purge, soft_purge, []}]}, + {<<"2.0\\.*">>, [{restart_application, ssh}]}, + {<<"1\\.*">>, [{restart_application, ssh}]} ] }. diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk index bff73a1b40..defa47f824 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.1 +SSH_VSN = 2.1.1 APP_VSN = "ssh-$(SSH_VSN)" |