From 446dbe8accfdc27ebe72161d763888acc0c90d1c Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Wed, 6 May 2015 17:41:04 +0200
Subject: eldap: Test suite uppdated to new time handling

---
 lib/eldap/test/eldap_basic_SUITE.erl | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'lib/eldap')

diff --git a/lib/eldap/test/eldap_basic_SUITE.erl b/lib/eldap/test/eldap_basic_SUITE.erl
index 137c61b2d9..8d754e934c 100644
--- a/lib/eldap/test/eldap_basic_SUITE.erl
+++ b/lib/eldap/test/eldap_basic_SUITE.erl
@@ -896,9 +896,9 @@ client_timeout(Fun, Config) ->
     T = 1000,
     case eldap:open([Host], [{timeout,T},{port,Port}|Opts]) of
 	{ok,H} ->
-	    T0 = now(),
+	    T0 = erlang:monotonic_time(),
 	    {error,{gen_tcp_error,timeout}} = Fun(H),
-	    T_op = diff(T0,now()),
+	    T_op = ms_passed(T0),
 	    ct:log("Time = ~p, Timeout spec = ~p",[T_op,T]),
 	    if
 		T_op < T ->
@@ -910,8 +910,12 @@ client_timeout(Fun, Config) ->
 	Other -> ct:fail("eldap:open failed: ~p",[Other])
     end.
 
-diff({M1,S1,U1},{M2,S2,U2}) ->
-    ( ((M2-M1)*1000 + (S2-S1))*1000 + (U2-U1) ).
+%% Help function, elapsed milliseconds since T0
+ms_passed(T0) ->
+    %% OTP 18
+    erlang:convert_time_unit(erlang:monotonic_time() - T0,
+			     native,
+			     micro_seconds) / 1000.
 
 %%%----------------------------------------------------------------
 init_ssl_certs_et_al(Config) ->
-- 
cgit v1.2.3


From 05efdc8e2db3d7d3d845166424d71e4b061049e5 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Mon, 11 May 2015 13:33:39 +0200
Subject: eldap: Remove doc man.3 warning

---
 lib/eldap/doc/src/eldap.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'lib/eldap')

diff --git a/lib/eldap/doc/src/eldap.xml b/lib/eldap/doc/src/eldap.xml
index ed35ee3a9c..a6fad8a857 100644
--- a/lib/eldap/doc/src/eldap.xml
+++ b/lib/eldap/doc/src/eldap.xml
@@ -403,7 +403,11 @@ filter()    See present/1, substrings/2,
 	<v>OptionalAttrs = [Attr]</v>
 	<v>Attr = {matchingRule,string()} | {type,string()} | {dnAttributes,boolean()}</v>
       </type>
-      <desc> <p>Creates an extensible match filter. For example, <c>eldap:extensibleMatch("Bar",[{type,"sn"},{matchingRule,"caseExactMatch"}]))</c> creates a filter which performs a <c>caseExactMatch</c> on the attribute <c>sn</c> and matches with the value <c>"Bar"</c>. The default value of <c>dnAttributes</c> is <c>false</c>.</p> </desc>
+      <desc> <p>Creates an extensible match filter. For example, </p>
+      <code>
+	eldap:extensibleMatch("Bar", [{type,"sn"}, {matchingRule,"caseExactMatch"}]))
+      </code>
+      <p>creates a filter which performs a <c>caseExactMatch</c> on the attribute <c>sn</c> and matches with the value <c>"Bar"</c>. The default value of <c>dnAttributes</c> is <c>false</c>.</p> </desc>
     </func>
     <func>
       <name>'and'([Filter]) -> filter()</name>
-- 
cgit v1.2.3


From e09dd66dc4d89c62ddfd8c19791f9678d5d787c6 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Tue, 12 May 2015 18:18:55 +0200
Subject: Prepare release

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

(limited to 'lib/eldap')

diff --git a/lib/eldap/doc/src/notes.xml b/lib/eldap/doc/src/notes.xml
index e76101c30e..a7aefefb4a 100644
--- a/lib/eldap/doc/src/notes.xml
+++ b/lib/eldap/doc/src/notes.xml
@@ -30,6 +30,22 @@
   </header>
   <p>This document describes the changes made to the Eldap application.</p>
 
+<section><title>Eldap 1.2</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Support added for LDAP Password Modify Extended Operation
+	    (RFC 3062). Thanks to danielwhite.</p>
+          <p>
+	    Own Id: OTP-12282</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Eldap 1.1.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
-- 
cgit v1.2.3


From 9a81b28598fadc44bf506354c9227e41aac786f6 Mon Sep 17 00:00:00 2001
From: Henrik Nord <henrik@erlang.org>
Date: Wed, 13 May 2015 09:40:16 +0200
Subject: Revert "Prepare release"

This reverts commit e09dd66dc4d89c62ddfd8c19791f9678d5d787c6.
---
 lib/eldap/doc/src/notes.xml | 16 ----------------
 1 file changed, 16 deletions(-)

(limited to 'lib/eldap')

diff --git a/lib/eldap/doc/src/notes.xml b/lib/eldap/doc/src/notes.xml
index a7aefefb4a..e76101c30e 100644
--- a/lib/eldap/doc/src/notes.xml
+++ b/lib/eldap/doc/src/notes.xml
@@ -30,22 +30,6 @@
   </header>
   <p>This document describes the changes made to the Eldap application.</p>
 
-<section><title>Eldap 1.2</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Support added for LDAP Password Modify Extended Operation
-	    (RFC 3062). Thanks to danielwhite.</p>
-          <p>
-	    Own Id: OTP-12282</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Eldap 1.1.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
-- 
cgit v1.2.3