aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-02-15 11:39:23 +0100
committerFredrik Gustafsson <[email protected]>2013-02-15 11:39:23 +0100
commit739b5db228de76dd42ab7f29983724cceafed9c2 (patch)
tree9392fe197c5f310c798d93261038af991de09a7e
parentf87220291781edc8145884ace92c0372271fe35f (diff)
parente01db0b75ff2b53d24d22d25e51e1157b4bc38b2 (diff)
downloadotp-739b5db228de76dd42ab7f29983724cceafed9c2.tar.gz
otp-739b5db228de76dd42ab7f29983724cceafed9c2.tar.bz2
otp-739b5db228de76dd42ab7f29983724cceafed9c2.zip
Merge branch 'fredrik/ssh/versions-R16B'
* fredrik/ssh/versions-R16B: Versions and appup ssh, R16B
-rw-r--r--lib/ssh/src/ssh.appup.src2
-rw-r--r--lib/ssh/vsn.mk2
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src
index 5ba3742de7..c4b5aa256b 100644
--- a/lib/ssh/src/ssh.appup.src
+++ b/lib/ssh/src/ssh.appup.src
@@ -19,6 +19,7 @@
{"%VSN%",
[
+ {<<"2.1.3">>, [{restart_application, ssh}]},
{<<"2.1.2">>, [{restart_application, ssh}]},
{<<"2.1.1">>, [{restart_application, ssh}]},
{<<"2.1">>, [{restart_application, ssh}]},
@@ -26,6 +27,7 @@
{<<"1\\.*">>, [{restart_application, ssh}]}
],
[
+ {<<"2.1.3">>, [{restart_application, ssh}]},
{<<"2.1.2">>, [{restart_application, ssh}]},
{<<"2.1.1">>, [{restart_application, ssh}]},
{<<"2.1">>,[{restart_application, ssh}]},
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 71666a3179..9fc4b0522e 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.3
+SSH_VSN = 2.1.4
APP_VSN = "ssh-$(SSH_VSN)"