diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-08-30 09:38:13 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-08-30 09:38:13 +0200 |
| commit | 9f69634d0ca0a21b0c8bc9ad1ab4d836db652170 (patch) | |
| tree | ddb8ed247bf9778e9d30a73175139caa434035a1 /lib/ssh/src/ssh.appup.src | |
| parent | 44b5b4f81398a0d0f2fc190fd5a77be3c594c6a8 (diff) | |
| parent | 94f6c68ff4a46c69be0030aff553d6db92f29a35 (diff) | |
| download | otp-9f69634d0ca0a21b0c8bc9ad1ab4d836db652170.tar.gz otp-9f69634d0ca0a21b0c8bc9ad1ab4d836db652170.tar.bz2 otp-9f69634d0ca0a21b0c8bc9ad1ab4d836db652170.zip | |
Merge remote branch 'upstream/maint'
* upstream/maint:
ssh: Increase robustness
inets: Dialyzer spec fixes
Diffstat (limited to 'lib/ssh/src/ssh.appup.src')
| -rw-r--r-- | lib/ssh/src/ssh.appup.src | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src index 6967a0f464..d08dbafc32 100644 --- a/lib/ssh/src/ssh.appup.src +++ b/lib/ssh/src/ssh.appup.src @@ -24,6 +24,7 @@ {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_file, soft_purge, soft_purge, []}]}, {load_module, ssh, soft_purge, soft_purge, []}]}, {<<"2.0\\.*">>, [{restart_application, ssh}]}, {<<"1\\.*">>, [{restart_application, ssh}]} @@ -34,6 +35,7 @@ {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_file, soft_purge, soft_purge, []}]}, {load_module, ssh, soft_purge, soft_purge, []}]}, {<<"2.0\\.*">>, [{restart_application, ssh}]}, {<<"1\\.*">>, [{restart_application, ssh}]} |