aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2016-05-02 13:09:20 +0200
committerHans Nilsson <[email protected]>2016-05-02 13:09:20 +0200
commit7cc731c30c4701251fec17d93a88ce2a8739b5b1 (patch)
treec5358ed2bb338fa4cf1c62612af7d1930a668c91
parent4921b2704b761a7dd87a17494a8b8336237a240a (diff)
parenta63116928a95d0a49196331d978c62dcd4941549 (diff)
downloadotp-7cc731c30c4701251fec17d93a88ce2a8739b5b1.tar.gz
otp-7cc731c30c4701251fec17d93a88ce2a8739b5b1.tar.bz2
otp-7cc731c30c4701251fec17d93a88ce2a8739b5b1.zip
Merge branch 'hans/ssh/prepare_for_release'
-rw-r--r--lib/ssh/src/ssh.app.src9
-rw-r--r--lib/ssh/vsn.mk2
2 files changed, 8 insertions, 3 deletions
diff --git a/lib/ssh/src/ssh.app.src b/lib/ssh/src/ssh.app.src
index c67350bf72..3245ba5197 100644
--- a/lib/ssh/src/ssh.app.src
+++ b/lib/ssh/src/ssh.app.src
@@ -40,7 +40,12 @@
{applications, [kernel, stdlib, crypto, public_key]},
{env, []},
{mod, {ssh_app, []}},
- {runtime_dependencies, ["stdlib-2.3","public_key-0.22","kernel-3.0",
- "erts-6.0","crypto-3.3"]}]}.
+ {runtime_dependencies, [
+ "crypto-3.3",
+ "erts-6.0",
+ "kernel-3.0",
+ "public_key-1.1",
+ "stdlib-3.0"
+ ]}]}.
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 41b42d454b..b165928877 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,5 +1,5 @@
#-*-makefile-*- ; force emacs to enter makefile-mode
-SSH_VSN = 4.2.2
+SSH_VSN = 4.3
APP_VSN = "ssh-$(SSH_VSN)"