aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/doc
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2018-03-02 12:13:28 +0100
committerHans Nilsson <[email protected]>2018-03-02 12:13:28 +0100
commit81b7a88884fd4ec36fd08680d04bff01d45e5548 (patch)
treeadcd873533dd9e65df493c7cc9bea6902857d8ca /lib/ssh/doc
parent79f8a5dfff65f06b8975e1765f52ee6a04d85001 (diff)
parent33521da61673b890bcd05eda02f38fea1fe58a30 (diff)
downloadotp-81b7a88884fd4ec36fd08680d04bff01d45e5548.tar.gz
otp-81b7a88884fd4ec36fd08680d04bff01d45e5548.tar.bz2
otp-81b7a88884fd4ec36fd08680d04bff01d45e5548.zip
Merge branch 'maint-19' into maint
* maint-19: Updated OTP version Prepare release ssl: Prepare for release ssl: Backport PR-1709 ssh: Fix cli ssh: Test for disabled shell Conflicts: OTP_VERSION lib/ssh/doc/src/notes.xml lib/ssh/src/ssh.erl lib/ssh/vsn.mk lib/ssl/doc/src/notes.xml lib/ssl/vsn.mk otp_versions.table
Diffstat (limited to 'lib/ssh/doc')
-rw-r--r--lib/ssh/doc/src/notes.xml17
1 files changed, 16 insertions, 1 deletions
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index c559da911b..df2e04c92a 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -49,7 +49,6 @@
</list>
</section>
-
<section><title>Improvements and New Features</title>
<list>
<item>
@@ -406,6 +405,22 @@
</section>
+
+<section><title>Ssh 4.4.2.2</title>
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Default exec is disabled when a user-defined shell is
+ enabled.</p>
+ <p>
+ Own Id: OTP-14881</p>
+ </item>
+ </list>
+ </section>
+</section>
+
+
<section><title>Ssh 4.4.2</title>
<section><title>Fixed Bugs and Malfunctions</title>