From 3341f513fe04f20ec8bd8e2cda12bc3a7d057d08 Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Thu, 1 Mar 2012 18:52:31 +0100
Subject: Prepare for release

Supervisor tree changed so can not do soft upgrade
---
 lib/ssh/src/ssh.appup.src | 26 ++++++--------------------
 lib/ssh/vsn.mk            |  2 +-
 2 files changed, 7 insertions(+), 21 deletions(-)

(limited to 'lib')

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)"
 
-- 
cgit v1.2.3