epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Clean up Release Notes merge

Browse Source
This commit is contained in:
Andrew Johnson
2016-02-29 17:53:59 -06:00
parent f73f3332fa
commit b4404c8266
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
documentation/RELEASE_NOTES.html
+1 -5
View File
@@ -57,11 +57,7 @@ back-porting some earlier changes from the 3.15 branch, and fixes
<a href="https://code.launchpad.net/bugs/1514520">Launchpad bug
#1514520</a>.</p>
<<<<<<< TREE
<h3>Fix <tt>ipAddrToAsciiAsync()</tt>: don't try to join the daemon thread</h3>
=======
<h3>ipAddrToAsciiAsync.: Don't try to join the daemon thread</h3>
>>>>>>> MERGE-SOURCE
<h3>Fix <tt>ipAddrToAsciiAsync()</tt>: Don't try to join the daemon thread</h3>
<p>On process exit, don't try to stop the worker thread that makes DNS lookups
asynchronous. Previously this would wait for any lookups still in progress,