aboutsummaryrefslogtreecommitdiffstats
path: root/lib/eldap
diff options
context:
space:
mode:
authorMagnus Lidén <[email protected]>2013-12-10 14:31:40 +0100
committerMagnus Lidén <[email protected]>2013-12-10 14:31:40 +0100
commit458e302f61e2de36ebd49c5a5a5b984224bdce94 (patch)
tree0eaff569e08f2cd170275fb38eff8e56993ae47d /lib/eldap
parent6d22d78204ca8bc8ed4beb92f6021ff3ba93a882 (diff)
parent25237481ccccd3ddfa74582dc267632ad618ba30 (diff)
downloadotp-458e302f61e2de36ebd49c5a5a5b984224bdce94.tar.gz
otp-458e302f61e2de36ebd49c5a5a5b984224bdce94.tar.bz2
otp-458e302f61e2de36ebd49c5a5a5b984224bdce94.zip
Merge tag 'OTP_R16B03'
The R16B03 release Conflicts: lib/sasl/vsn.mk
Diffstat (limited to 'lib/eldap')
-rw-r--r--lib/eldap/doc/src/notes.xml34
-rw-r--r--lib/eldap/vsn.mk2
2 files changed, 34 insertions, 2 deletions
diff --git a/lib/eldap/doc/src/notes.xml b/lib/eldap/doc/src/notes.xml
index c21717a47a..e7a3e20202 100644
--- a/lib/eldap/doc/src/notes.xml
+++ b/lib/eldap/doc/src/notes.xml
@@ -30,7 +30,39 @@
</header>
<p>This document describes the changes made to the Eldap application.</p>
- <section><title>Eldap 1.0.1</title>
+ <section><title>Eldap 1.0.2</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Removed {verify,0} from ssl-options because eldap does
+ not support peer verification. Thanks to Florian Waas for
+ reporting.</p>
+ <p>
+ Own Id: OTP-11354</p>
+ </item>
+ </list>
+ </section>
+
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ The ldap client eldap now supports the start_tls
+ operation. This upgrades an existing tcp connection to
+ encryption using tls, if the server supports it. See
+ eldap:start_tls/2 and /3.</p>
+ <p>
+ Own Id: OTP-11336</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
+<section><title>Eldap 1.0.1</title>
<section><title>Improvements and New Features</title>
<list>
diff --git a/lib/eldap/vsn.mk b/lib/eldap/vsn.mk
index 4d05d3d1e3..dd1f50653c 100644
--- a/lib/eldap/vsn.mk
+++ b/lib/eldap/vsn.mk
@@ -1 +1 @@
-ELDAP_VSN = 1.0.1
+ELDAP_VSN = 1.0.2