aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-06-07 11:43:23 +0200
committerFredrik Gustafsson <[email protected]>2013-06-07 11:43:23 +0200
commita997eedde2036c1629c822736378021843ce320c (patch)
treec0a57a2719fb326621b8130f3ec10b24898dde99
parent2aa5ae6f94d11fc63920db1e5ef2e8933a428794 (diff)
parentf7295b48627fb84bceef61044b6f2d0cbee10c2b (diff)
downloadotp-a997eedde2036c1629c822736378021843ce320c.tar.gz
otp-a997eedde2036c1629c822736378021843ce320c.tar.bz2
otp-a997eedde2036c1629c822736378021843ce320c.zip
Merge branch 'maint'
-rw-r--r--lib/ssh/src/ssh.appup.src14
1 files changed, 2 insertions, 12 deletions
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src
index b25e0c9e37..32f7cc470b 100644
--- a/lib/ssh/src/ssh.appup.src
+++ b/lib/ssh/src/ssh.appup.src
@@ -19,22 +19,12 @@
{"%VSN%",
[
- {<<"2.1.4">>, [{load_module, ssh_sftp, soft_purge, soft_purge, []},
- {load_module, ssh_connection_handler, soft_purge, soft_purge, []}]},
- {<<"2.1.3">>, [{restart_application, ssh}]},
- {<<"2.1.2">>, [{restart_application, ssh}]},
- {<<"2.1.1">>, [{restart_application, ssh}]},
- {<<"2.1">>, [{restart_application, ssh}]},
+ {<<"2.1\\.*">>, [{restart_application, ssh}]},
{<<"2.0\\.*">>, [{restart_application, ssh}]},
{<<"1\\.*">>, [{restart_application, ssh}]}
],
[
- {<<"2.1.4">>, [{load_module, ssh_sftp, soft_purge, soft_purge, []},
- {load_module, ssh_connection_handler, soft_purge, soft_purge, []}]},
- {<<"2.1.3">>, [{restart_application, ssh}]},
- {<<"2.1.2">>, [{restart_application, ssh}]},
- {<<"2.1.1">>, [{restart_application, ssh}]},
- {<<"2.1">>,[{restart_application, ssh}]},
+ {<<"2.1\\.*">>,[{restart_application, ssh}]},
{<<"2.0\\.*">>, [{restart_application, ssh}]},
{<<"1\\.*">>, [{restart_application, ssh}]}
]