From 1a93d0f54e4064b22923cc5cb426c82150ad4431 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Tue, 20 Mar 2018 12:08:36 +0100
Subject: ssh: Fix bad spec for double_algs() in ssh.hrl

---
 lib/ssh/src/ssh.hrl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/ssh')

diff --git a/lib/ssh/src/ssh.hrl b/lib/ssh/src/ssh.hrl
index 4711f54fb5..8d950eea3c 100644
--- a/lib/ssh/src/ssh.hrl
+++ b/lib/ssh/src/ssh.hrl
@@ -114,7 +114,7 @@
                              | {mac, double_algs()}
                              | {compression, double_algs()} .
 -type simple_algs()         :: list( atom() ) .
--type double_algs()         :: list( {client2serverlist,simple_algs()} | {server2client,simple_algs()} )
+-type double_algs()         :: list( {client2server,simple_algs()} | {server2client,simple_algs()} )
                              | simple_algs() .
 
 -type options() :: #{socket_options   := socket_options(),
-- 
cgit v1.2.3


From a77d73ada12dd82df33bc3c9ab4c9efa6232ff94 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Wed, 21 Mar 2018 18:33:13 +0100
Subject: Update version numbers

---
 lib/ssh/vsn.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/ssh')

diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 99c5cbd346..d5eed0b087 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,4 +1,4 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
-SSH_VSN = 4.6.6
+SSH_VSN = 4.6.7
 APP_VSN    = "ssh-$(SSH_VSN)"
-- 
cgit v1.2.3


From 8ed28dfa4434b2f885bc495a79a9670a32563781 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Wed, 21 Mar 2018 18:33:26 +0100
Subject: Update release notes

---
 lib/ssh/doc/src/notes.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'lib/ssh')

diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index ba563335a2..db60b4ab6f 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -30,6 +30,21 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Ssh 4.6.7</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix bad spec in ssh.hrl: <c>double_algs()</c>.</p>
+          <p>
+	    Own Id: OTP-14990</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Ssh 4.6.6</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
-- 
cgit v1.2.3