ACE+TAO-6_5_2ACE+TAO-6_5_2

60 files changed, 1317 insertions, 76 deletions

diff --git a/ACE/ChangeLogs/ACE-6_5_2 b/ACE/ChangeLogs/ACE-6_5_2
new file mode 100644
index 00000000000..b311dda5107
--- /dev/null
+++ b/ACE/ChangeLogs/ACE-6_5_2
@@ -0,0 +1,338 @@
+commit 011bf410fc6819c49497d8adbf8bdcc0d464b7ea
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Wed Sep 12 10:49:55 2018 -0500
+
+    ACE_QtReactor: work-around a Qt5 bug
+
+commit 5fbe132d07ca2fa714f20a5be4ef25e6a32d37dc
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Tue Sep 11 15:01:45 2018 -0500
+
+    Removed qt4=1 from gnuace.features.
+    
+    In order to switch between qt4 and qt5, the actual state of Qt support needs to be known at the time makefiles are generated with MPC.
+
+commit d43bdde22b088d4ba8280c8dbf8947cdf2835c7d
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Tue Sep 11 08:53:48 2018 -0500
+
+    Allow Qt custom file types even when neither supported Qt version is enabled
+
+commit aaeeeb818dff6826cca42d1a5d63eb106fa8ab02
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Sep 11 09:01:13 2018 +0200
+
+    Removed comment at top of mpc file
+
+commit 0de90a8d46631024eb28a800c214129f85550fae
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Sep 11 09:01:01 2018 +0200
+
+    Layou change
+    
+        * ACE/README:
+
+commit 29506289651778c6218c4c65af77b2cc5785c8ec
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Sep 11 09:00:46 2018 +0200
+
+    Small changes to the doc files we package where
+    
+        * ACE/rpmbuild/ace-tao.spec:
+
+commit d8991068db5dfcb98a703323d7469da9615c43e2
+Merge: a752608aaa7 06a00d65352
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Mon Sep 10 18:17:32 2018 -0500
+
+    Merge pull request #697 from mitza-oci/qt5
+    
+    Qt5 support
+
+commit a752608aaa76f8b0939918c920e47ec3ed5ea51f
+Merge: 69e4852390e 141d42047ca
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Mon Sep 10 18:16:01 2018 -0500
+
+    Merge pull request #696 from mitza-oci/warnings
+    
+    Fixed clang warnings
+
+commit 06a00d6535256ddaf2f031d5521c095c3d3cf40e
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Mon Sep 10 08:32:47 2018 -0500
+
+    Use qt5 mpc feature
+
+commit 2a4d10f1e13aadcb4735c81064b9cf60d81c8d6a
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Mon Sep 10 08:07:56 2018 -0500
+
+    Projects using qtreactor need to be skipped when there's no qt
+    
+    Added NEWS
+
+commit 69e4852390e89fe8c8fe6eadedfaae9348cee091
+Merge: f5890a26e2a b91e4aa764f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sun Sep 9 10:01:38 2018 +0100
+
+    Merge pull request #698 from jwillemsen/master
+    
+    Removed qt settings to 0 for debian packaging, these are disabled by default
+
+commit b91e4aa764f05f3acc0d05973eade26cfec909d2
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat Sep 8 14:50:24 2018 +0200
+
+    Removed qt settings to 0, these are disabled by default
+    
+        * ACE/debian/default.features:
+        * ACE/debian/platform_macros.GNU:
+
+commit f5890a26e2a40b811f87efaa372affd1771fa1b6
+Merge: a6398b53bd6 23e563b05ff
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Fri Sep 7 16:56:39 2018 -0500
+
+    Merge pull request #684 from iguessthislldo/master
+    
+    Disable Qt5 MPC Feature by Default
+
+commit 95bf013bd3bccdada189c038efbd93c87b774b1b
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Fri Sep 7 16:29:56 2018 -0500
+
+    Qt5 support
+
+commit 141d42047ca42cbd011c01ff1f7cc395b4a1b37f
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Fri Sep 7 16:25:09 2018 -0500
+
+    Fixed warning from clang
+
+commit 43f29d07196a29b536b8b0dc934c7877e93d16c7
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Sep 7 16:59:33 2018 +0200
+
+    Layout changes
+    
+        * ACE/ace/QtReactor/QtReactor.h:
+        * TAO/tao/BiDir_GIOP/BiDirGIOP.h:
+        * TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h:
+        * TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h:
+        * TAO/tao/BiDir_GIOP/BiDir_Policy_i.h:
+        * TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h:
+        * TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h:
+        * TAO/tao/EndpointPolicy/EndpointPolicy_i.h:
+        * TAO/tao/EndpointPolicy/IIOPEndpointValue_i.h:
+        * TAO/tao/IORInterceptor/IORInfo.h:
+        * TAO/tao/QtResource/QtResource_Factory.h:
+
+commit 5739964a26f380fd4051d1d78ca95d1212ac3970
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Sep 7 10:51:52 2018 +0200
+
+    List change
+    
+        * ACE/NEWS:
+
+commit 4a37c070ec51742c8a2e152901e3a47f7093ea55
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Sep 3 16:40:12 2018 +0200
+
+    Layout change
+    
+        * ACE/ace/Service_Repository.h:
+
+commit fff288bee7bc9a1d1e870ebd5c5d8cfcd11e6db8
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Sep 3 16:23:43 2018 +0200
+
+    Fixed typo in comment
+    
+        * ACE/ace/Service_Config.h:
+        * ACE/ace/Service_Gestalt.cpp:
+        * ACE/ace/TSS_T.h:
+
+commit 16c5af445ef3067bb364d97460fc2d80beb409be
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Sep 3 14:05:58 2018 +0200
+
+    Only define BIO_set_flags when it has not been defined yet
+    
+        * ACE/ace/SSL/SSL_Asynch_BIO.cpp:
+
+commit 9d8f3669be70635e3caceb84241c267cb143d6d0
+Merge: 5b33255ed43 b9b8143d1e7
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 31 19:38:30 2018 +0100
+
+    Merge pull request #686 from jwillemsen/jwi-cbuilderx-strtok
+    
+     Corrected version check to also include C++BuilderXE2
+
+commit b9b8143d1e76a10d84e940b7b0845f49cf4a021f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 31 17:52:00 2018 +0200
+
+    Fixed typo in comment
+    
+        * ACE/ace/Future.h:
+
+commit 72ea4b7804d5f2d193513d7ed20036a778775786
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 31 17:51:46 2018 +0200
+
+    Corrected version check to also include C++BuilderXE2
+    
+        * ACE/ace/config-win32-borland.h:
+
+commit 94a495724845a9e2345dcfe428d5d8c4f05db594
+Merge: c763cbad5ed 037af8d86a7
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Fri Aug 31 08:55:34 2018 -0500
+
+    Merge pull request #681 from mitza-oci/gnuace-postbuild
+    
+    gnuace: postbuild step shouldn't run until after exeout/dllout/libout link/copy
+
+commit 18f775e47a7a03530c76935f80fd1c18e66d4c8e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 31 10:23:46 2018 +0200
+
+    Fixed typo
+    
+        * ACE/ace/QtReactor/QtReactor.h:
+
+commit 23e563b05ff215fe82c5f491cca396a4186a152f
+Author: Fred Hornsey <fred@hornsey.us>
+Date:   Thu Aug 30 16:53:13 2018 -0500
+
+    Disable Qt5 MPC Feature by Default
+
+commit af38510e83bd5b8cbeb6777c7415677eb0d35e8b
+Author: Like Ma <likemartinma@gmail.com>
+Date:   Thu Aug 30 16:19:32 2018 +0800
+
+    Use RAND_poll instead of RAND_screen that is deprecated in OpenSSL 1.1
+
+commit 037af8d86a759c1970aff32d94c03aac7d88001f
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Wed Aug 29 11:30:05 2018 -0500
+
+    gnuace: postbuild step shouldn't run until after exeout/dllout/libout link/copy
+
+commit 54c418e976e750016877a1c3bcd53e093c1ea824
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Aug 29 11:51:04 2018 +0200
+
+    Check observer pointer before using it
+    
+        * ACE/ace/Future.cpp:
+
+commit 97c91c6f403cca708bfd46f03b0facd04a0c14f1
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Aug 16 12:13:05 2018 +0200
+
+    Updated msvc check, works now with Visual Studio 2017
+    
+        * ACE/tests/Compiler_Features_27_Test.cpp:
+
+commit 0bb2f07ae39fd19ad96e8db8895fad69e42e09a4
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Aug 16 12:12:48 2018 +0200
+
+    Removed empty lines
+    
+        * ACE/examples/Map_Manager/test_hash_map_manager.cpp:
+
+commit 15701d04189a817616d3fa26b69ea5bfccb7f52f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Aug 15 13:01:52 2018 +0200
+
+    Removed empty line
+    
+        * ACE/ace/Service_Object.cpp:
+
+commit f061bb71b6b58cc51aeae57fd99e10e6de286c1c
+Merge: 68381f0376d fb7aa2fd418
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 10 21:30:29 2018 +0200
+
+    Merge pull request #668 from jwillemsen/jwi-imr-enhancements
+    
+    Logging enhancements to the ImR
+
+commit 9626700e4e3fa997bb1e9e9a2a399eca3960bde6
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 10 13:31:24 2018 +0200
+
+    Fixed typos
+    
+        * ACE/ace/Connector.h:
+        * TAO/docs/pluggable_messaging.html:
+        * TAO/examples/Persistent_Grid/Grid_Client_i.cpp:
+        * TAO/examples/Persistent_Grid/Persistent_Client_i.cpp:
+        * TAO/examples/Simple/grid/Grid_Client_i.cpp:
+        * TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h:
+        * TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp:
+        * TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp:
+        * TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp:
+        * TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp:
+        * TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp:
+        * TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp:
+        * TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp:
+        * TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp:
+        * TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp:
+        * TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp:
+        * TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp:
+        * TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp:
+        * TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp:
+        * TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp:
+        * TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp:
+        * TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp:
+        * TAO/tao/ImR_Client/ImplRepo.idl:
+
+commit c173bf51bc1f898964662cb51246e0b7c0109690
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Aug 9 14:24:49 2018 +0200
+
+    Updated list of Visual Studio versions we pregenerate as part of the release
+    
+        * ACE/docs/Download.html:
+
+commit 24dc765d24cd5544ba3c6239829a7d2ea65a0642
+Merge: f9b4c7aa49e 82c6ba74c4d
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Aug 9 14:23:46 2018 +0200
+
+    Merge branch 'master' into jwi-zapvc12-release
+
+commit 82c6ba74c4d4fb52e07ea8846b5d1abf642cae7c
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Aug 9 10:56:00 2018 +0200
+
+    Updated copy/past text for doxygen gen
+    
+        * ACE/docs/bczar/bczar.html:
+
+commit f9b4c7aa49e674e49ffe12ffc9d8dc3d2f42cf49
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Aug 9 10:55:29 2018 +0200
+
+    Don't ship vc12 generated solutions, Visual Studio 2015 and 2017 are the ones most used
+    
+        * ACE/bin/make_release.py:
+
+commit f92154b03a1dda2440d9be98219fea996623029b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Aug 9 10:48:41 2018 +0200
+
+    Make x.5.1 public and prepare for the next release
+    
+        * ACE/NEWS:
+        * ACE/bin/diff-builds-and-group-fixed-tests-only.sh:
+        * ACE/docs/Download.html:
+        * ACE/etc/index.html:
+        * TAO/NEWS:
diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM
index a1914366bfc..75b1119c9a2 100644
--- a/ACE/PROBLEM-REPORT-FORM
+++ b/ACE/PROBLEM-REPORT-FORM
@@ -40,7 +40,7 @@
 To: ace-bugs@list.isis.vanderbilt.edu
 Subject: [area]: [synopsis]
 
-    ACE VERSION: 6.5.1
+    ACE VERSION: 6.5.2
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/ACE/VERSION b/ACE/VERSION
index c702e5d6dbb..9241f2bc305 100644
--- a/ACE/VERSION
+++ b/ACE/VERSION
@@ -1,4 +1,4 @@
-This is ACE version 6.5.1, released Thu Aug 09 10:43:17 CEST 2018
+This is ACE version 6.5.2, released Tue Sep 18 09:25:49 CEST 2018
 
 If you have any problems with or questions about ACE, please send
 e-mail to the ACE mailing list (ace-bugs@list.isis.vanderbilt.edu),
diff --git a/ACE/ace/Version.h b/ACE/ace/Version.h
index cfa043cfcdd..145af28027e 100644
--- a/ACE/ace/Version.h
+++ b/ACE/ace/Version.h
@@ -4,9 +4,9 @@
 
 #define ACE_MAJOR_VERSION 6
 #define ACE_MINOR_VERSION 5
-#define ACE_MICRO_VERSION 1
-#define ACE_BETA_VERSION 1
-#define ACE_VERSION "6.5.1"
-#define ACE_VERSION_CODE 394497
+#define ACE_MICRO_VERSION 2
+#define ACE_BETA_VERSION 2
+#define ACE_VERSION "6.5.2"
+#define ACE_VERSION_CODE 394498
 #define ACE_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))
 
diff --git a/ACE/debian/control b/ACE/debian/control
index 6d125c0b7a3..25d98b26a84 100644
--- a/ACE/debian/control
+++ b/ACE/debian/control
@@ -27,7 +27,7 @@ Description: makefile, project, and workspace creator
   * mpc-ace: generates project files for a single target
   * mwc-ace: generates workspace files for a set of projects
 
-Package: libace-6.5.1
+Package: libace-6.5.2
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -45,7 +45,7 @@ Description: C++ network programming framework
 Package: libace-dev
 Architecture: any
 Section: libdevel
-Depends: libace-6.5.1 (= ${binary:Version}), ${misc:Depends}
+Depends: libace-6.5.2 (= ${binary:Version}), ${misc:Depends}
 Suggests: libace-doc, pkg-config
 Replaces: mpc-ace (<< 5.6.3-4)
 Description: C++ network programming framework - development files
@@ -62,7 +62,7 @@ Description: C++ network programming framework - documentation
  This package contains the ACE overview documentation, tutorials,
  examples, and information regarding upstream development.
 
-Package: libace-ssl-6.5.1
+Package: libace-ssl-6.5.2
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -73,12 +73,12 @@ Description: ACE secure socket layer library
 Package: libace-ssl-dev
 Architecture: any
 Section: libdevel
-Depends: libace-ssl-6.5.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends}
+Depends: libace-ssl-6.5.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends}
 Description: ACE secure socket layer library - development files
  This package contains the header files and static library for the ACE
  SSL library.
 
-Package: libace-rmcast-6.5.1
+Package: libace-rmcast-6.5.2
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -92,12 +92,12 @@ Description: ACE reliable multicast library
 Package: libace-rmcast-dev
 Architecture: any
 Section: libdevel
-Depends: libace-rmcast-6.5.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-rmcast-6.5.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE reliable multicast library - development files
  This package contains the header files and static library for the ACE
  reliable multicast library.
 
-Package: libace-tmcast-6.5.1
+Package: libace-tmcast-6.5.2
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -111,12 +111,12 @@ Description: ACE transactional multicast library
 Package: libace-tmcast-dev
 Architecture: any
 Section: libdevel
-Depends: libace-tmcast-6.5.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-tmcast-6.5.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE transactional multicast library - development files
  This package contains the header files and static library for the ACE
  transactional multicast library.
 
-Package: libace-htbp-6.5.1
+Package: libace-htbp-6.5.2
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -130,12 +130,12 @@ Description: ACE protocol over HTTP tunneling library
 Package: libace-htbp-dev
 Architecture: any
 Section: libdevel
-Depends: libace-htbp-6.5.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-htbp-6.5.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE protocol over HTTP tunneling library - development files
  This package contains the header files and static library for the ACE
  HTBP library.
 
-Package: libace-inet-6.5.1
+Package: libace-inet-6.5.2
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -146,15 +146,15 @@ Description: ACE Inet protocol library
 Package: libace-inet-dev
 Architecture: any
 Section: libdevel
-Depends: libace-inet-6.5.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-6.5.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE Inet protocol library - development files
  This package contains the header files and static library for the ACE
  Inet protocol library.
 
-Package: libace-inet-ssl-6.5.1
+Package: libace-inet-ssl-6.5.2
 Architecture: any
 Section: libs
-Depends: libace-inet-6.5.1, libace-ssl-6.5.1, ${shlibs:Depends}, ${misc:Depends}
+Depends: libace-inet-6.5.2, libace-ssl-6.5.2, ${shlibs:Depends}, ${misc:Depends}
 Description: ACE SSL-enabled Inet protocol library
  This package provides an ACE addon library for clients (and possibly
  servers at some point) using Inet protocols which support SSL, such as
@@ -163,7 +163,7 @@ Description: ACE SSL-enabled Inet protocol library
 Package: libace-inet-ssl-dev
 Architecture: any
 Section: libdevel
-Depends: libace-inet-ssl-6.5.1 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-ssl-6.5.2 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE SSL-enabled Inet protocol library - development files
  This package contains the header files and static library for the ACE
  SSL-enabled Inet protocol library.
@@ -180,7 +180,7 @@ Description: ACE perfect hash function generator
  basically the same options and functionality. ace_gperf simply takes
  advantage of some of the features provided by the ACE library.
 
-Package: libacexml-6.5.1
+Package: libacexml-6.5.2
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -196,12 +196,12 @@ Package: libacexml-dev
 Architecture: any
 Section: libdevel
 Replaces: libace-dev (<< 5.7.7-4)
-Depends: libacexml-6.5.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libacexml-6.5.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE SAX based XML parsing library - development files
  This package contains the header files and static library for the ACE
  XML parsing library.
 
-Package: libace-xml-utils-6.5.1
+Package: libace-xml-utils-6.5.2
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -215,12 +215,12 @@ Package: libace-xml-utils-dev
 Architecture: any
 Section: libdevel
 Replaces: libace-dev (<< 5.7.7-4)
-Depends: libace-xml-utils-6.5.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev
+Depends: libace-xml-utils-6.5.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev
 Description: ACE XML utility classes and methods - development files
  This package contains the header files and static library for the ACE XML
  Utils library
 
-Package: libkokyu-6.5.1
+Package: libkokyu-6.5.2
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -234,12 +234,12 @@ Description: ACE scheduling and dispatching library
 Package: libkokyu-dev
 Architecture: any
 Section: libdevel
-Depends: libkokyu-6.5.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libkokyu-6.5.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE scheduling and dispatching library - development files
  This package contains the header files and static library for the ACE
  scheduling and dispatching library.
 
-Package: libace-xtreactor-6.5.1
+Package: libace-xtreactor-6.5.2
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -257,12 +257,12 @@ Description: ACE-GUI reactor integration for Xt
 Package: libace-xtreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-xtreactor-6.5.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends}
+Depends: libace-xtreactor-6.5.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends}
 Description: ACE-GUI reactor integration for Xt - development files
  This package contains header files and static library for the ACE-Xt
  reactor integration.
 
-Package: libace-tkreactor-6.5.1
+Package: libace-tkreactor-6.5.2
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -281,12 +281,12 @@ Description: ACE-GUI reactor integration for Tk
 Package: libace-tkreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-tkreactor-6.5.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends}
+Depends: libace-tkreactor-6.5.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends}
 Description: ACE-GUI reactor integration for Tk - development files
  This package contains header files and static library for the ACE-Tk
  reactor integration.
 
-Package: libace-flreactor-6.5.1
+Package: libace-flreactor-6.5.2
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -304,12 +304,12 @@ Description: ACE-GUI reactor integration for FLTK
 Package: libace-flreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-flreactor-6.5.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 1.1.4), ${misc:Depends}
+Depends: libace-flreactor-6.5.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 1.1.4), ${misc:Depends}
 Description: ACE-GUI reactor integration for FLTK - development files
  This package contains header files and static library for the ACE-FLTK
  reactor integration.
 
-Package: libace-foxreactor-6.5.1
+Package: libace-foxreactor-6.5.2
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -326,7 +326,7 @@ Description: ACE-GUI reactor integration for FOX
 Package: libace-foxreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-foxreactor-6.5.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
+Depends: libace-foxreactor-6.5.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
 Description: ACE-GUI reactor integration for FOX - development files
  This package contains header files and static library for the ACE-FOX
  reactor integration.
@@ -343,7 +343,7 @@ Description: ACE network service implementations
  files to link the various ACE network services together, either
  statically or dynamically, and form complete server programs.
 
-Package: libnetsvcs-6.5.1
+Package: libnetsvcs-6.5.2
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -357,7 +357,7 @@ Description: ACE network service implementations - libraries
 Package: libnetsvcs-dev
 Architecture: any
 Section: libdevel
-Depends: libnetsvcs-6.5.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libnetsvcs-6.5.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE network service implementations - development files
  ACE network services provide reusable components for common
  distributed system tasks such as logging, naming, locking, and time
diff --git a/ACE/debian/libace-6.5.1.lintian-overrides b/ACE/debian/libace-6.5.1.lintian-overrides
deleted file mode 100644
index 2714f19d6c7..00000000000
--- a/ACE/debian/libace-6.5.1.lintian-overrides
+++ /dev/null
@@ -1,6 +0,0 @@
-libace-6.5.1: no-symbols-control-file usr/lib/libACE-6.5.1.so
-libace-6.5.1: no-symbols-control-file usr/lib/libACE_ETCL_Parser-6.5.1.so
-libace-6.5.1: no-symbols-control-file usr/lib/libACE_Monitor_Control-6.5.1.so
-libace-6.5.1: no-symbols-control-file usr/lib/libACE_ETCL-6.5.1.so
-libace-6.5.1: no-symbols-control-file usr/lib/libACE_RLECompression-6.5.1.so
-libace-6.5.1: no-symbols-control-file usr/lib/libACE_Compression-6.5.1.so
diff --git a/ACE/debian/libace-6.5.1.docs b/ACE/debian/libace-6.5.2.docs
index 3bdab5b0089..3bdab5b0089 100644
--- a/ACE/debian/libace-6.5.1.docs
+++ b/ACE/debian/libace-6.5.2.docs
diff --git a/ACE/debian/libace-6.5.1.install b/ACE/debian/libace-6.5.2.install
index 182a5eda411..182a5eda411 100644
--- a/ACE/debian/libace-6.5.1.install
+++ b/ACE/debian/libace-6.5.2.install
diff --git a/ACE/debian/libace-6.5.2.lintian-overrides b/ACE/debian/libace-6.5.2.lintian-overrides
new file mode 100644
index 00000000000..2c6a8f23a26
--- /dev/null
+++ b/ACE/debian/libace-6.5.2.lintian-overrides
@@ -0,0 +1,6 @@
+libace-6.5.2: no-symbols-control-file usr/lib/libACE-6.5.2.so
+libace-6.5.2: no-symbols-control-file usr/lib/libACE_ETCL_Parser-6.5.2.so
+libace-6.5.2: no-symbols-control-file usr/lib/libACE_Monitor_Control-6.5.2.so
+libace-6.5.2: no-symbols-control-file usr/lib/libACE_ETCL-6.5.2.so
+libace-6.5.2: no-symbols-control-file usr/lib/libACE_RLECompression-6.5.2.so
+libace-6.5.2: no-symbols-control-file usr/lib/libACE_Compression-6.5.2.so
diff --git a/ACE/debian/libace-flreactor-6.5.1.lintian-overrides b/ACE/debian/libace-flreactor-6.5.1.lintian-overrides
deleted file mode 100644
index dac21a0e023..00000000000
--- a/ACE/debian/libace-flreactor-6.5.1.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-flreactor-6.5.1: no-symbols-control-file usr/lib/libACE_FlReactor-6.5.1.so
diff --git a/ACE/debian/libace-flreactor-6.5.1.install b/ACE/debian/libace-flreactor-6.5.2.install
index 528836aacee..528836aacee 100644
--- a/ACE/debian/libace-flreactor-6.5.1.install
+++ b/ACE/debian/libace-flreactor-6.5.2.install
diff --git a/ACE/debian/libace-flreactor-6.5.2.lintian-overrides b/ACE/debian/libace-flreactor-6.5.2.lintian-overrides
new file mode 100644
index 00000000000..d2c0a3aa593
--- /dev/null
+++ b/ACE/debian/libace-flreactor-6.5.2.lintian-overrides
@@ -0,0 +1 @@
+libace-flreactor-6.5.2: no-symbols-control-file usr/lib/libACE_FlReactor-6.5.2.so
diff --git a/ACE/debian/libace-foxreactor-6.5.1.lintian-overrides b/ACE/debian/libace-foxreactor-6.5.1.lintian-overrides
deleted file mode 100644
index 10f4c23d0dd..00000000000
--- a/ACE/debian/libace-foxreactor-6.5.1.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-foxreactor-6.5.1: no-symbols-control-file usr/lib/libACE_FoxReactor-6.5.1.so
diff --git a/ACE/debian/libace-foxreactor-6.5.1.install b/ACE/debian/libace-foxreactor-6.5.2.install
index e360f29f5af..e360f29f5af 100644
--- a/ACE/debian/libace-foxreactor-6.5.1.install
+++ b/ACE/debian/libace-foxreactor-6.5.2.install
diff --git a/ACE/debian/libace-foxreactor-6.5.2.lintian-overrides b/ACE/debian/libace-foxreactor-6.5.2.lintian-overrides
new file mode 100644
index 00000000000..552b11a964b
--- /dev/null
+++ b/ACE/debian/libace-foxreactor-6.5.2.lintian-overrides
@@ -0,0 +1 @@
+libace-foxreactor-6.5.2: no-symbols-control-file usr/lib/libACE_FoxReactor-6.5.2.so
diff --git a/ACE/debian/libace-htbp-6.5.1.lintian-overrides b/ACE/debian/libace-htbp-6.5.1.lintian-overrides
deleted file mode 100644
index 15f2dbee773..00000000000
--- a/ACE/debian/libace-htbp-6.5.1.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-htbp-6.5.1: no-symbols-control-file usr/lib/libACE_HTBP-6.5.1.so
diff --git a/ACE/debian/libace-htbp-6.5.1.install b/ACE/debian/libace-htbp-6.5.2.install
index 08103fd5cad..08103fd5cad 100644
--- a/ACE/debian/libace-htbp-6.5.1.install
+++ b/ACE/debian/libace-htbp-6.5.2.install
diff --git a/ACE/debian/libace-htbp-6.5.2.lintian-overrides b/ACE/debian/libace-htbp-6.5.2.lintian-overrides
new file mode 100644
index 00000000000..386b435edb5
--- /dev/null
+++ b/ACE/debian/libace-htbp-6.5.2.lintian-overrides
@@ -0,0 +1 @@
+libace-htbp-6.5.2: no-symbols-control-file usr/lib/libACE_HTBP-6.5.2.so
diff --git a/ACE/debian/libace-inet-6.5.1.lintian-overrides b/ACE/debian/libace-inet-6.5.1.lintian-overrides
deleted file mode 100644
index eb9027827ae..00000000000
--- a/ACE/debian/libace-inet-6.5.1.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-libace-inet-6.5.1: extended-description-is-probably-too-short
-libace-inet-6.5.1: no-symbols-control-file usr/lib/libACE_INet-6.5.1.so
diff --git a/ACE/debian/libace-inet-6.5.1.install b/ACE/debian/libace-inet-6.5.2.install
index 59a73a509d0..59a73a509d0 100644
--- a/ACE/debian/libace-inet-6.5.1.install
+++ b/ACE/debian/libace-inet-6.5.2.install
diff --git a/ACE/debian/libace-inet-6.5.2.lintian-overrides b/ACE/debian/libace-inet-6.5.2.lintian-overrides
new file mode 100644
index 00000000000..8f451dc7ad4
--- /dev/null
+++ b/ACE/debian/libace-inet-6.5.2.lintian-overrides
@@ -0,0 +1,2 @@
+libace-inet-6.5.2: extended-description-is-probably-too-short
+libace-inet-6.5.2: no-symbols-control-file usr/lib/libACE_INet-6.5.2.so
diff --git a/ACE/debian/libace-inet-ssl-6.5.1.lintian-overrides b/ACE/debian/libace-inet-ssl-6.5.1.lintian-overrides
deleted file mode 100644
index 5409d9a19d0..00000000000
--- a/ACE/debian/libace-inet-ssl-6.5.1.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-libace-inet-ssl-6.5.1: no-symbols-control-file usr/lib/libACE_INet_SSL-6.5.1.so
-
-# It's Bison-generate code covered by the GNU Bison GPL-exception
-libace-inet-ssl-6.5.1: possible-gpl-code-linked-with-openssl
diff --git a/ACE/debian/libace-inet-ssl-6.5.1.install b/ACE/debian/libace-inet-ssl-6.5.2.install
index b9b8b9045f7..b9b8b9045f7 100644
--- a/ACE/debian/libace-inet-ssl-6.5.1.install
+++ b/ACE/debian/libace-inet-ssl-6.5.2.install
diff --git a/ACE/debian/libace-inet-ssl-6.5.2.lintian-overrides b/ACE/debian/libace-inet-ssl-6.5.2.lintian-overrides
new file mode 100644
index 00000000000..bcb3079d1db
--- /dev/null
+++ b/ACE/debian/libace-inet-ssl-6.5.2.lintian-overrides
@@ -0,0 +1,4 @@
+libace-inet-ssl-6.5.2: no-symbols-control-file usr/lib/libACE_INet_SSL-6.5.2.so
+
+# It's Bison-generate code covered by the GNU Bison GPL-exception
+libace-inet-ssl-6.5.2: possible-gpl-code-linked-with-openssl
diff --git a/ACE/debian/libace-rmcast-6.5.1.lintian-overrides b/ACE/debian/libace-rmcast-6.5.1.lintian-overrides
deleted file mode 100644
index b279a07f4e7..00000000000
--- a/ACE/debian/libace-rmcast-6.5.1.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-rmcast-6.5.1: no-symbols-control-file usr/lib/libACE_RMCast-6.5.1.so
diff --git a/ACE/debian/libace-rmcast-6.5.1.install b/ACE/debian/libace-rmcast-6.5.2.install
index 86e78259853..86e78259853 100644
--- a/ACE/debian/libace-rmcast-6.5.1.install
+++ b/ACE/debian/libace-rmcast-6.5.2.install
diff --git a/ACE/debian/libace-rmcast-6.5.2.lintian-overrides b/ACE/debian/libace-rmcast-6.5.2.lintian-overrides
new file mode 100644
index 00000000000..cf94e80df3d
--- /dev/null
+++ b/ACE/debian/libace-rmcast-6.5.2.lintian-overrides
@@ -0,0 +1 @@
+libace-rmcast-6.5.2: no-symbols-control-file usr/lib/libACE_RMCast-6.5.2.so
diff --git a/ACE/debian/libace-ssl-6.5.1.lintian-overrides b/ACE/debian/libace-ssl-6.5.1.lintian-overrides
deleted file mode 100644
index 268215ac1c2..00000000000
--- a/ACE/debian/libace-ssl-6.5.1.lintian-overrides
+++ /dev/null
@@ -1,5 +0,0 @@
-libace-ssl-6.5.1: extended-description-is-probably-too-short
-libace-ssl-6.5.1: no-symbols-control-file usr/lib/libACE_SSL-6.5.1.so
-
-# It's Bison-generate code covered by the GNU Bison GPL-exception
-libace-ssl-6.5.1: possible-gpl-code-linked-with-openssl
diff --git a/ACE/debian/libace-ssl-6.5.1.NEWS b/ACE/debian/libace-ssl-6.5.2.NEWS
index e5bd0e4aa10..e5bd0e4aa10 100644
--- a/ACE/debian/libace-ssl-6.5.1.NEWS
+++ b/ACE/debian/libace-ssl-6.5.2.NEWS
diff --git a/ACE/debian/libace-ssl-6.5.1.install b/ACE/debian/libace-ssl-6.5.2.install
index 8df45a6d55f..8df45a6d55f 100644
--- a/ACE/debian/libace-ssl-6.5.1.install
+++ b/ACE/debian/libace-ssl-6.5.2.install
diff --git a/ACE/debian/libace-ssl-6.5.2.lintian-overrides b/ACE/debian/libace-ssl-6.5.2.lintian-overrides
new file mode 100644
index 00000000000..9b9d32fdba8
--- /dev/null
+++ b/ACE/debian/libace-ssl-6.5.2.lintian-overrides
@@ -0,0 +1,5 @@
+libace-ssl-6.5.2: extended-description-is-probably-too-short
+libace-ssl-6.5.2: no-symbols-control-file usr/lib/libACE_SSL-6.5.2.so
+
+# It's Bison-generate code covered by the GNU Bison GPL-exception
+libace-ssl-6.5.2: possible-gpl-code-linked-with-openssl
diff --git a/ACE/debian/libace-tkreactor-6.5.1.lintian-overrides b/ACE/debian/libace-tkreactor-6.5.1.lintian-overrides
deleted file mode 100644
index a9ab81aa82a..00000000000
--- a/ACE/debian/libace-tkreactor-6.5.1.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-tkreactor-6.5.1: no-symbols-control-file usr/lib/libACE_TkReactor-6.5.1.so
diff --git a/ACE/debian/libace-tkreactor-6.5.1.install b/ACE/debian/libace-tkreactor-6.5.2.install
index 12ab35062d2..12ab35062d2 100644
--- a/ACE/debian/libace-tkreactor-6.5.1.install
+++ b/ACE/debian/libace-tkreactor-6.5.2.install
diff --git a/ACE/debian/libace-tkreactor-6.5.2.lintian-overrides b/ACE/debian/libace-tkreactor-6.5.2.lintian-overrides
new file mode 100644
index 00000000000..57332e40e76
--- /dev/null
+++ b/ACE/debian/libace-tkreactor-6.5.2.lintian-overrides
@@ -0,0 +1 @@
+libace-tkreactor-6.5.2: no-symbols-control-file usr/lib/libACE_TkReactor-6.5.2.so
diff --git a/ACE/debian/libace-tmcast-6.5.1.lintian-overrides b/ACE/debian/libace-tmcast-6.5.1.lintian-overrides
deleted file mode 100644
index ba6f5d444b5..00000000000
--- a/ACE/debian/libace-tmcast-6.5.1.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-tmcast-6.5.1: no-symbols-control-file usr/lib/libACE_TMCast-6.5.1.so
diff --git a/ACE/debian/libace-tmcast-6.5.1.install b/ACE/debian/libace-tmcast-6.5.2.install
index e066131dea0..e066131dea0 100644
--- a/ACE/debian/libace-tmcast-6.5.1.install
+++ b/ACE/debian/libace-tmcast-6.5.2.install
diff --git a/ACE/debian/libace-tmcast-6.5.2.lintian-overrides b/ACE/debian/libace-tmcast-6.5.2.lintian-overrides
new file mode 100644
index 00000000000..9ee76d5186e
--- /dev/null
+++ b/ACE/debian/libace-tmcast-6.5.2.lintian-overrides
@@ -0,0 +1 @@
+libace-tmcast-6.5.2: no-symbols-control-file usr/lib/libACE_TMCast-6.5.2.so
diff --git a/ACE/debian/libace-xml-utils-6.5.1.lintian-overrides b/ACE/debian/libace-xml-utils-6.5.1.lintian-overrides
deleted file mode 100644
index 92e739e7e78..00000000000
--- a/ACE/debian/libace-xml-utils-6.5.1.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-xml-utils-6.5.1: no-symbols-control-file usr/lib/libACE_XML_Utils-6.5.1.so
diff --git a/ACE/debian/libace-xml-utils-6.5.1.install b/ACE/debian/libace-xml-utils-6.5.2.install
index 2428ec9f109..2428ec9f109 100644
--- a/ACE/debian/libace-xml-utils-6.5.1.install
+++ b/ACE/debian/libace-xml-utils-6.5.2.install
diff --git a/ACE/debian/libace-xml-utils-6.5.2.lintian-overrides b/ACE/debian/libace-xml-utils-6.5.2.lintian-overrides
new file mode 100644
index 00000000000..42c31526464
--- /dev/null
+++ b/ACE/debian/libace-xml-utils-6.5.2.lintian-overrides
@@ -0,0 +1 @@
+libace-xml-utils-6.5.2: no-symbols-control-file usr/lib/libACE_XML_Utils-6.5.2.so
diff --git a/ACE/debian/libace-xtreactor-6.5.1.lintian-overrides b/ACE/debian/libace-xtreactor-6.5.1.lintian-overrides
deleted file mode 100644
index e8634b20f6f..00000000000
--- a/ACE/debian/libace-xtreactor-6.5.1.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-xtreactor-6.5.1: no-symbols-control-file usr/lib/libACE_XtReactor-6.5.1.so
diff --git a/ACE/debian/libace-xtreactor-6.5.1.install b/ACE/debian/libace-xtreactor-6.5.2.install
index c53614c7208..c53614c7208 100644
--- a/ACE/debian/libace-xtreactor-6.5.1.install
+++ b/ACE/debian/libace-xtreactor-6.5.2.install
diff --git a/ACE/debian/libace-xtreactor-6.5.2.lintian-overrides b/ACE/debian/libace-xtreactor-6.5.2.lintian-overrides
new file mode 100644
index 00000000000..ee0bc214bdd
--- /dev/null
+++ b/ACE/debian/libace-xtreactor-6.5.2.lintian-overrides
@@ -0,0 +1 @@
+libace-xtreactor-6.5.2: no-symbols-control-file usr/lib/libACE_XtReactor-6.5.2.so
diff --git a/ACE/debian/libacexml-6.5.1.lintian-overrides b/ACE/debian/libacexml-6.5.1.lintian-overrides
deleted file mode 100644
index fe225835640..00000000000
--- a/ACE/debian/libacexml-6.5.1.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-libacexml-6.5.1: no-symbols-control-file usr/lib/libACEXML_Parser-6.5.1.so
-libacexml-6.5.1: no-symbols-control-file usr/lib/libACEXML_XML_Svc_Conf_Parser-6.5.1.so
-libacexml-6.5.1: no-symbols-control-file usr/lib/libACEXML-6.5.1.so
diff --git a/ACE/debian/libacexml-6.5.1.docs b/ACE/debian/libacexml-6.5.2.docs
index 002855d7915..002855d7915 100644
--- a/ACE/debian/libacexml-6.5.1.docs
+++ b/ACE/debian/libacexml-6.5.2.docs
diff --git a/ACE/debian/libacexml-6.5.1.install b/ACE/debian/libacexml-6.5.2.install
index d3e912ffa51..d3e912ffa51 100644
--- a/ACE/debian/libacexml-6.5.1.install
+++ b/ACE/debian/libacexml-6.5.2.install
diff --git a/ACE/debian/libacexml-6.5.2.lintian-overrides b/ACE/debian/libacexml-6.5.2.lintian-overrides
new file mode 100644
index 00000000000..b4d34a87a85
--- /dev/null
+++ b/ACE/debian/libacexml-6.5.2.lintian-overrides
@@ -0,0 +1,3 @@
+libacexml-6.5.2: no-symbols-control-file usr/lib/libACEXML_Parser-6.5.2.so
+libacexml-6.5.2: no-symbols-control-file usr/lib/libACEXML_XML_Svc_Conf_Parser-6.5.2.so
+libacexml-6.5.2: no-symbols-control-file usr/lib/libACEXML-6.5.2.so
diff --git a/ACE/debian/libkokyu-6.5.1.lintian-overrides b/ACE/debian/libkokyu-6.5.1.lintian-overrides
deleted file mode 100644
index cd0ad5a1687..00000000000
--- a/ACE/debian/libkokyu-6.5.1.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libkokyu-6.5.1: no-symbols-control-file usr/lib/libKokyu-6.5.1.so
diff --git a/ACE/debian/libkokyu-6.5.1.docs b/ACE/debian/libkokyu-6.5.2.docs
index e8869c513b2..e8869c513b2 100644
--- a/ACE/debian/libkokyu-6.5.1.docs
+++ b/ACE/debian/libkokyu-6.5.2.docs
diff --git a/ACE/debian/libkokyu-6.5.1.install b/ACE/debian/libkokyu-6.5.2.install
index 62854308f96..62854308f96 100644
--- a/ACE/debian/libkokyu-6.5.1.install
+++ b/ACE/debian/libkokyu-6.5.2.install
diff --git a/ACE/debian/libkokyu-6.5.2.lintian-overrides b/ACE/debian/libkokyu-6.5.2.lintian-overrides
new file mode 100644
index 00000000000..e759bbcfd7e
--- /dev/null
+++ b/ACE/debian/libkokyu-6.5.2.lintian-overrides
@@ -0,0 +1 @@
+libkokyu-6.5.2: no-symbols-control-file usr/lib/libKokyu-6.5.2.so
diff --git a/ACE/debian/libnetsvcs-6.5.1.lintian-overrides b/ACE/debian/libnetsvcs-6.5.1.lintian-overrides
deleted file mode 100644
index acbc604bd48..00000000000
--- a/ACE/debian/libnetsvcs-6.5.1.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libnetsvcs-6.5.1: no-symbols-control-file usr/lib/libnetsvcs-6.5.1.so
diff --git a/ACE/debian/libnetsvcs-6.5.1.docs b/ACE/debian/libnetsvcs-6.5.2.docs
index 0b03c55b91f..0b03c55b91f 100644
--- a/ACE/debian/libnetsvcs-6.5.1.docs
+++ b/ACE/debian/libnetsvcs-6.5.2.docs
diff --git a/ACE/debian/libnetsvcs-6.5.1.install b/ACE/debian/libnetsvcs-6.5.2.install
index c7a04b16213..c7a04b16213 100644
--- a/ACE/debian/libnetsvcs-6.5.1.install
+++ b/ACE/debian/libnetsvcs-6.5.2.install
diff --git a/ACE/debian/libnetsvcs-6.5.2.lintian-overrides b/ACE/debian/libnetsvcs-6.5.2.lintian-overrides
new file mode 100644
index 00000000000..aa26fd7ba22
--- /dev/null
+++ b/ACE/debian/libnetsvcs-6.5.2.lintian-overrides
@@ -0,0 +1 @@
+libnetsvcs-6.5.2: no-symbols-control-file usr/lib/libnetsvcs-6.5.2.so
diff --git a/ACE/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec
index e266696a4cc..152fe30e408 100644
--- a/ACE/rpmbuild/ace-tao.spec
+++ b/ACE/rpmbuild/ace-tao.spec
@@ -1,6 +1,6 @@
 # Set the version number here.
-%define ACEVER  6.5.1
-%define TAOVER  2.5.1
+%define ACEVER  6.5.2
+%define TAOVER  2.5.2
 
 # Conditional build
 # Default values are
diff --git a/TAO/ChangeLogs/TAO-2_5_2 b/TAO/ChangeLogs/TAO-2_5_2
new file mode 100644
index 00000000000..70d1c654951
--- /dev/null
+++ b/TAO/ChangeLogs/TAO-2_5_2
@@ -0,0 +1,903 @@
+commit 7bb903ff16f80a6bd7b6a0d9779162bb0ee43ed6
+Merge: 06f7c45a665 53b3dd4d14e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sun Sep 16 14:11:31 2018 +0100
+
+    Merge pull request #709 from jwillemsen/jwi-constexceptiondata
+    
+    Use const exception data pointer when using invoke, not changed by th…
+
+commit 53b3dd4d14ef7f317394d2cb0d0bc72212b52d09
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sun Sep 16 13:49:49 2018 +0200
+
+    Use const exception data pointer when using invoke, not changed by the implementation, only used
+    
+        * TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.c:
+        * TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp:
+        * TAO/tao/DynamicInterface/DII_Invocation_Adapter.h:
+        * TAO/tao/Invocation_Adapter.cpp:
+        * TAO/tao/Invocation_Adapter.h:
+        * TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp:
+        * TAO/tao/Messaging/Asynch_Invocation_Adapter.h:
+        * TAO/tao/operation_details.h:
+        * TAO/tao/operation_details.inl:
+
+commit 07537d121db79a027dea811939fba8b13c2c44c3
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Fri Sep 14 10:37:21 2018 -0500
+
+    Updated SSLECName option (see PR #683) for compatibility with OpenSSL libraries built without EC support; applied style guidelines
+
+commit aaeeeb818dff6826cca42d1a5d63eb106fa8ab02
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Sep 11 09:01:13 2018 +0200
+
+    Removed comment at top of mpc file
+
+commit fcfe2830f8f8790a4f044d5cd3d12c6b2ae8edd7
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Sep 11 09:00:09 2018 +0200
+
+    Layout changes
+    
+        * TAO/tao/CodecFactory/CDR_Encaps_Codec.h:
+        * TAO/tao/CodecFactory/CodecFactory_impl.h:
+
+commit d8991068db5dfcb98a703323d7469da9615c43e2
+Merge: a752608aaa7 06a00d65352
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Mon Sep 10 18:17:32 2018 -0500
+
+    Merge pull request #697 from mitza-oci/qt5
+    
+    Qt5 support
+
+commit 95bf013bd3bccdada189c038efbd93c87b774b1b
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Fri Sep 7 16:29:56 2018 -0500
+
+    Qt5 support
+
+commit 8024f9ae9fc8acce347ebd765cf08e550823c111
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Fri Sep 7 16:24:55 2018 -0500
+
+    Fixing warnings from clang by using up-to-date lex and yacc
+
+commit 43f29d07196a29b536b8b0dc934c7877e93d16c7
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Sep 7 16:59:33 2018 +0200
+
+    Layout changes
+    
+        * ACE/ace/QtReactor/QtReactor.h:
+        * TAO/tao/BiDir_GIOP/BiDirGIOP.h:
+        * TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h:
+        * TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h:
+        * TAO/tao/BiDir_GIOP/BiDir_Policy_i.h:
+        * TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h:
+        * TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h:
+        * TAO/tao/EndpointPolicy/EndpointPolicy_i.h:
+        * TAO/tao/EndpointPolicy/IIOPEndpointValue_i.h:
+        * TAO/tao/IORInterceptor/IORInfo.h:
+        * TAO/tao/QtResource/QtResource_Factory.h:
+
+commit 1cd6a89f603e5c6942f8decb6390a7ba1321c730
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Sep 4 17:19:31 2018 +0200
+
+    Layout changes
+    
+        * TAO/tao/DynamicInterface/DII_Invocation.h:
+        * TAO/tao/DynamicInterface/DII_Reply_Handler.h:
+
+commit 5181314f8b8e80f23fe9289fdf7ccbfc5d950405
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Sep 4 15:45:10 2018 +0200
+
+    Layout changes
+    
+        * TAO/tao/ImR_Client/ServerObject.idl:
+
+commit 15ba1c53b779239d11e3451c196efff0855b17b7
+Merge: e1e2fd98b9b d81e9fe526d
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Sep 4 13:05:37 2018 +0100
+
+    Merge pull request #692 from jwillemsen/jwi-imrlogging
+    
+    Only log errors when we have a debugging level set
+
+commit d81e9fe526d94121a583d93ae73beff22bc34ee3
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Sep 4 13:17:02 2018 +0200
+
+    Only log errors when we have a debugging level set
+    
+        * TAO/tao/ImR_Client/ImR_Client.cpp:
+
+commit e1e2fd98b9bdf875ccca86fbe16c09ae54ffb948
+Merge: 982ff2069c2 4a37c070ec5
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Sep 3 18:23:58 2018 +0100
+
+    Merge pull request #691 from jwillemsen/jwi-typo
+    
+    Fixed typo in comment
+
+commit eeceb693bd5dc1349f0094c1f925fc8c160e5e9e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Sep 3 16:23:23 2018 +0200
+
+    Layout change
+    
+        * TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp:
+
+commit 9f3efb4dae088e53fadfdacb66acc0647b5bc9d0
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Sep 3 13:45:38 2018 +0200
+
+    Layout changes
+    
+        * TAO/tao/PortableServer/PortableServer.cpp:
+        * TAO/tao/PortableServer/Root_POA.h:
+        * TAO/tao/PortableServer/Upcall_Command.h:
+        * TAO/tao/PortableServer/Upcall_Wrapper.h:
+
+commit d5a11aab8e8ac24aaa5bd70069092208c3752c20
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Sep 3 13:45:25 2018 +0200
+
+    Make TAO_Requires_POA_Initializer a const int as attempt to let C++Builder be used with precompiled headers
+    
+        * TAO/tao/PortableServer/PortableServer.h:
+
+commit b019a5bdcd18b04b9c175c9bb79eb515178b75b2
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Sep 3 09:40:00 2018 +0200
+
+    Layout changes
+    
+        * TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp:
+        * TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp:
+        * TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp:
+        * TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp:
+        * TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp:
+        * TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp:
+        * TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp:
+        * TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp:
+        * TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp:
+        * TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp:
+        * TAO/tao/PortableServer/Network_Priority_Hook.cpp:
+        * TAO/tao/PortableServer/Object_Adapter_Factory.cpp:
+        * TAO/tao/PortableServer/Policy_Strategy.h:
+        * TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp:
+        * TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h:
+        * TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp:
+        * TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp:
+        * TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp:
+        * TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h:
+        * TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp:
+        * TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp:
+        * TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp:
+        * TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp:
+        * TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp:
+        * TAO/tao/PortableServer/ThreadStrategyORBControl.cpp:
+        * TAO/tao/PortableServer/ThreadStrategySingle.cpp:
+        * TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp:
+
+commit 407ffcd7ae65dccd6c203d12474697ca90f39dbc
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Sep 3 09:33:43 2018 +0200
+
+    Layout changes
+    
+        * TAO/tao/PortableServer/IdAssignmentStrategyFactory.h:
+        * TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h:
+        * TAO/tao/PortableServer/IdUniquenessStrategyFactory.h:
+        * TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h:
+        * TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h:
+        * TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h:
+        * TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h:
+        * TAO/tao/PortableServer/LifespanStrategyFactory.h:
+        * TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h:
+        * TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h:
+        * TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h:
+        * TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h:
+        * TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h:
+        * TAO/tao/PortableServer/RequestProcessingStrategyFactory.h:
+        * TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h:
+        * TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h:
+        * TAO/tao/PortableServer/ServantRetentionStrategyFactory.h:
+        * TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h:
+        * TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h:
+        * TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h:
+        * TAO/tao/PortableServer/ThreadStrategyFactory.h:
+        * TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h:
+        * TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h:
+
+commit 8dcfb4d004aa2644c306ace0960f3349bfba4488
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Sep 3 09:07:34 2018 +0200
+
+    Some more unicode related changes
+    
+        * TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp:
+        * TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp:
+        * TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp:
+        * TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h:
+        * TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp:
+        * TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h:
+        * TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp:
+
+commit 5d4650e1fb199403206cd8ef5ea41f2b095f1b6f
+Merge: 9d8f3669be7 79f53f320db
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 31 21:12:05 2018 +0100
+
+    Merge pull request #687 from jwillemsen/jwi-ifr
+    
+    Unicode and layout fixes to the IFR
+
+commit 79f53f320db28270d2d4d21a46d514e65e22af44
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 31 18:50:05 2018 +0200
+
+    Unicode and layout fixes to the IFR
+    
+        * TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp:
+        * TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp:
+        * TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h:
+        * TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp:
+        * TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h:
+        * TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp:
+        * TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h:
+        * TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp:
+        * TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h:
+        * TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h:
+        * TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp:
+        * TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp:
+        * TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h:
+        * TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h:
+        * TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h:
+        * TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h:
+        * TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp:
+        * TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h:
+        * TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h:
+        * TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h:
+        * TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h:
+        * TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h:
+        * TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h:
+        * TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h:
+        * TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h:
+        * TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h:
+        * TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h:
+        * TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h:
+
+commit 2682046ca800ec414414af8fee13b9d2aa136bc4
+Author: Doug Lewis <lewisdo@objectcomputing.com>
+Date:   Fri Aug 31 09:10:54 2018 -0500
+
+    SSLIOP ECDH: Updated NEWS file to include modifications for pull request #683.
+
+commit b02c157ba9049f5405ec889463cf290e97fd50c8
+Author: Doug Lewis <lewisdo@objectcomputing.com>
+Date:   Thu Aug 30 12:43:33 2018 -0500
+
+    SSLIOP ECDH: Reduced the scope of the variable ec_nid.
+
+commit 3ff3e337f1b70600b9ebc9c02c1bcc2e0c8d33f2
+Author: Doug Lewis <lewisdo@objectcomputing.com>
+Date:   Thu Aug 30 12:14:33 2018 -0500
+
+    SSLIOP ECDH: Removed id line at top of file.
+
+commit 7d870b7618398f3e3caa477df8d13b2ac44e1485
+Author: Doug Lewis <lewisdo@objectcomputing.com>
+Date:   Thu Aug 30 10:18:49 2018 -0500
+
+    SSLIOP ECDH: Updated to execute test using ECDH.
+
+commit 1c48b797177a0494b3e976058890b47f5348b1da
+Author: Doug Lewis <lewisdo@objectcomputing.com>
+Date:   Thu Aug 30 09:39:43 2018 -0500
+
+    Added Eliptic Curve support to SSLIOP.
+
+commit 4c3a606f281cdd7774d30e9c5332b0c77916f2ba
+Merge: abc4ad2d92d 73b03c94fe5
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 13 21:23:15 2018 +0200
+
+    Merge pull request #669 from jwillemsen/jwi-aamserverstatus
+    
+    For per client activated servers store the server reference within the AAM
+
+commit cc7af2a7494f2d3780d546b727ef4e2dcb1f34d9
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 13 16:02:22 2018 +0200
+
+    Remove old security files
+
+commit 73b03c94fe505229f6b65049b1e63fd79b1d68d7
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 13 12:11:02 2018 +0200
+
+    Layout changes
+    
+        * TAO/DevGuideExamples/GettingStarted/README:
+        * TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp:
+        * TAO/DevGuideExamples/ValueTypes/Messenger/README:
+
+commit ef21fb3d8291aa9ee52e015dc27f9799213f3bc3
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 13 12:10:52 2018 +0200
+
+    Destroy the ORB at the end of main
+    
+        * TAO/DevGuideExamples/AMH/MessengerClient.cpp:
+        * TAO/DevGuideExamples/GettingStarted/MessengerClient.cpp:
+
+commit 7025278b0f67b8fd708ca200190700096a72ab20
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 13 12:01:35 2018 +0200
+
+    List ImR changes
+    
+        * TAO/NEWS:
+
+commit 2e6128b2a163baf87b47c1cdfafdb6cfd0cc67fb
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 13 12:01:22 2018 +0200
+
+    Const fix
+    
+        * TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp:
+
+commit 020071fb0b2ac9695189c7f0ada32f43a06669a4
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 13 09:51:19 2018 +0200
+
+    Active_Pid_Setter is only required on Windows
+    
+        * TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp:
+        * TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h:
+
+commit 56745c6aa5a41f32c5f579374c11026da512c0ed
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 13 09:49:46 2018 +0200
+
+    Shutdown the ORB at the end of the test
+    
+        * TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerClient.cpp:
+        * TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/client.cpp:
+        * TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp:
+        * TAO/orbsvcs/tests/ImplRepo/kill_server/client.cpp:
+        * TAO/orbsvcs/tests/ImplRepo/kill_slow_server/client.cpp:
+        * TAO/orbsvcs/tests/ImplRepo/link_poas/README:
+        * TAO/orbsvcs/tests/ImplRepo/link_poas/client.cpp:
+        * TAO/orbsvcs/tests/ImplRepo/scale/client.cpp:
+        * TAO/orbsvcs/tests/ImplRepo/servers_list/client.cpp:
+
+commit 2ebdd3122e41b5248ce980f9a7e1feba36e13b95
+Merge: 866e66604d7 83f60cc01e3
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 13 09:29:48 2018 +0200
+
+    Merge branch 'master' into jwi-aamserverstatus
+
+commit 83f60cc01e3507d4f62c96cb6ec92283637e63a9
+Merge: 89254264ab9 1c187c24033
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 13 09:16:32 2018 +0200
+
+    Merge pull request #673 from jwillemsen/jwi-anyarrayuniqueptr
+    
+    Make use of std::unique_ptr when C++11 or newer is enabled
+
+commit 1c187c2403375db21b15bd7d5d73f50ee109cde6
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sun Aug 12 19:25:53 2018 +0200
+
+    Make use of std::unique_ptr when C++11 or newer is enabled
+    
+        * TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp:
+
+commit bf184730dcc870979f5e2cdbd974576c18eb2ae4
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sun Aug 12 19:22:49 2018 +0200
+
+    Catch exceptions by reference
+    
+        * TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp:
+        * TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.h:
+        * TAO/tests/ZIOP/client.cpp:
+
+commit 866e66604d7b80c6847ff82895ff594f95048ae2
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sun Aug 12 11:12:19 2018 +0200
+
+    In a per client mode each server only gets one request and it is the responsibility of the client to shutdown the server at that moment
+    
+        * TAO/orbsvcs/examples/ImR/Advanced/Messenger_i.h:
+        * TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp:
+        * TAO/orbsvcs/tests/ImplRepo/scale_clients/Test.idl:
+        * TAO/orbsvcs/tests/ImplRepo/scale_clients/Test_i.cpp:
+        * TAO/orbsvcs/tests/ImplRepo/scale_clients/Test_i.h:
+        * TAO/orbsvcs/tests/ImplRepo/scale_clients/client.cpp:
+        * TAO/orbsvcs/tests/ImplRepo/scale_clients/run_test.pl:
+        * TAO/orbsvcs/tests/ImplRepo/scale_clients/server.cpp:
+
+commit 0594c965df6cd3537b10ae152cc47d6786bc9abf
+Merge: 09272a89da2 cfcc4c2fa50
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat Aug 11 11:06:12 2018 +0200
+
+    Merge pull request #671 from jwillemsen/jwi-imractivator-loggingfix
+    
+    Fixed incorrect order of arguments to logging macro
+
+commit 3a468cb9498ceb79b53b595da51c41fe2f7b5f59
+Merge: 5e6bac19742 cfcc4c2fa50
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat Aug 11 09:14:47 2018 +0200
+
+    Merge branch 'jwi-imractivator-loggingfix' into jwi-aamserverstatus
+
+commit cfcc4c2fa5082a72f69802679a45809d651057c8
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat Aug 11 09:14:07 2018 +0200
+
+    Fixed incorrect order of arguments to logging macro
+    
+        * TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp:
+
+commit 5e6bac19742e4f86be8310857c046eb7a83da9ca
+Merge: 5f46c339eff 6f4b009d2fb
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat Aug 11 09:01:00 2018 +0200
+
+    Merge branch 'jwi-imrwindows-fix' into jwi-aamserverstatus
+
+commit 5f46c339eff94c16cdabe5abcc4c695d080d94c4
+Merge: 741d9ae10dc f061bb71b6b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat Aug 11 09:00:54 2018 +0200
+
+    Merge branch 'master' into jwi-aamserverstatus
+
+commit 6f4b009d2fbdf9387ade953d0839b49889fd0884
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat Aug 11 09:00:20 2018 +0200
+
+    Fixed windows runtime issue
+    
+        * TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp:
+
+commit f061bb71b6b58cc51aeae57fd99e10e6de286c1c
+Merge: 68381f0376d fb7aa2fd418
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 10 21:30:29 2018 +0200
+
+    Merge pull request #668 from jwillemsen/jwi-imr-enhancements
+    
+    Logging enhancements to the ImR
+
+commit 68381f0376d2d15399c41a6d6f87c84158019b82
+Merge: 4cae0e9397e aaa64c96bcc
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 10 16:33:39 2018 +0200
+
+    Merge pull request #667 from jwillemsen/jwi-valuetypeamh-uniqueptr
+    
+    Make use of std::unique_ptr when we have C++11 or newer
+
+commit 741d9ae10dc93e259ffc1374101cf5714b1d0936
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 10 16:33:22 2018 +0200
+
+    Store the server status for per client activation within the AAM
+    
+        * TAO/orbsvcs/DevGuideExamples/ImplRepo/README:
+        * TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp:
+        * TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h:
+        * TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp:
+        * TAO/orbsvcs/tests/ImplRepo/scale_clients/run_test.pl:
+        * TAO/orbsvcs/tests/ImplRepo/scale_clients/server.cpp:
+
+commit fb7aa2fd4182de6fc7b736de2b6818ab8caeec58
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 10 15:43:31 2018 +0200
+
+    Pass -ORBDebugLevel to the imr with the user specified level (-debug)
+    
+        * TAO/orbsvcs/tests/ImplRepo/scale_clients/run_test.pl:
+
+commit f956338f34bb7e4692e8237f6f056c2989850556
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 10 15:43:12 2018 +0200
+
+    Fixed compile error
+    
+        * TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp:
+
+commit d7aa752a85bcbab5479d688bb848109584bc1370
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 10 15:41:31 2018 +0200
+
+    Revert some test changes, the AAM for multiple parallel spawned servers for per client mode will share the same Server_Info struct, aligned logging of the AAM
+    
+        * TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp:
+        * TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h:
+        * TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp:
+        * TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h:
+
+commit c0be713cc78355a3c314ebcd0dd1fec4e6009b88
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 10 15:26:58 2018 +0200
+
+    Check for self assignment in assignment operator
+    
+        * TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp:
+
+commit 7527844612ad3476f1d9a3d4de94cf2b59227f99
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 10 15:26:33 2018 +0200
+
+    Docu change
+    
+        * TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.h:
+
+commit ae4fd13501edbe7a1dcdd5765499805b5739a9c6
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 10 15:26:16 2018 +0200
+
+    Removed get_info method, not used, const changes
+    
+        * TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp:
+        * TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h:
+
+commit 4f304ec1d6443641c2b64a1adc2c56f0a6e84c5d
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 10 15:25:34 2018 +0200
+
+    Initialise pointer to zero
+
+commit 786e4ceb66569c307edcd4fd27290e4c7cbb192a
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 10 15:01:53 2018 +0200
+
+    Initialise pointer with zero
+    
+        * TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp:
+
+commit aaa64c96bcc4a3807ffeb709390c31dbf3036cb6
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 10 14:01:15 2018 +0200
+
+    Make use of std::unique_ptr when we have C++11 or newer
+    
+        * TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
+
+commit 2de77538d1c27db849df7f0febeeca1a711227aa
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 10 14:00:08 2018 +0200
+
+    Enhanced logging and use more const
+    
+        * TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp:
+        * TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h:
+
+commit 9626700e4e3fa997bb1e9e9a2a399eca3960bde6
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 10 13:31:24 2018 +0200
+
+    Fixed typos
+    
+        * ACE/ace/Connector.h:
+        * TAO/docs/pluggable_messaging.html:
+        * TAO/examples/Persistent_Grid/Grid_Client_i.cpp:
+        * TAO/examples/Persistent_Grid/Persistent_Client_i.cpp:
+        * TAO/examples/Simple/grid/Grid_Client_i.cpp:
+        * TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h:
+        * TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp:
+        * TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp:
+        * TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp:
+        * TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp:
+        * TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp:
+        * TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp:
+        * TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp:
+        * TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp:
+        * TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp:
+        * TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp:
+        * TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp:
+        * TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp:
+        * TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp:
+        * TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp:
+        * TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp:
+        * TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp:
+        * TAO/tao/ImR_Client/ImplRepo.idl:
+
+commit dfadfdb61a81156c29843b1f109efb26b16fa777
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 10 12:53:57 2018 +0200
+
+    Layout changes
+    
+        * TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp:
+        * TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h:
+
+commit 216262946e5a3cbd2aee32466a7df8389ffda232
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 10 12:53:35 2018 +0200
+
+    Pass the server id to the LifeEntry so that we have it in our log
+    
+        * TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp:
+
+commit 06c60787c7ef2e522430a674d21834561954dc3f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 10 12:15:58 2018 +0200
+
+    Logging enhancements
+    
+        * TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp:
+        * TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp:
+        * TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp:
+        * TAO/orbsvcs/ImplRepo_Service/Server_Info.h:
+        * TAO/orbsvcs/ImplRepo_Service/UpdateableServerInfo.h:
+        * TAO/orbsvcs/tests/ImplRepo/scale_clients/run_test.pl:
+
+commit 6137b63daec938fd3db13a36f26ab5df072e9477
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 10 11:29:14 2018 +0200
+
+    Logging enhancements
+    
+        * TAO/orbsvcs/ImplRepo_Service/Activator_Options.h:
+        * TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp:
+        * TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp:
+        * TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp:
+        * TAO/orbsvcs/tests/ImplRepo/scale_clients/run_test.pl:
+
+commit 59b8c6ab8b8f508c84ef40f9dc1f0504e83d17b1
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 10 10:44:43 2018 +0200
+
+    Fixed typo
+    
+        * TAO/orbsvcs/ImplRepo_Service/README:
+
+commit a9845587e6bb5d310e4d8bbec421ef102327576f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 10 10:41:39 2018 +0200
+
+    Logging and const changes
+    
+        * TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp:
+
+commit 1cf406cdd07dd66a51d5a78dcbf65499fe21be92
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 10 10:32:26 2018 +0200
+
+    Logging enhancements
+    
+        * TAO/bin/tao_other_tests.lst:
+        * TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp:
+        * TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h:
+        * TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp:
+        * TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp:
+        * TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp:
+        * TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp:
+        * TAO/orbsvcs/ImplRepo_Service/LiveCheck.h:
+        * TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp:
+        * TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp:
+        * TAO/orbsvcs/tests/ImplRepo/scale_clients/Test_i.h:
+        * TAO/orbsvcs/tests/ImplRepo/scale_clients/client.cpp:
+        * TAO/orbsvcs/tests/ImplRepo/scale_clients/server.cpp:
+
+commit c534c7d92cb95fe9424eeceec259836455f9b432
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 10 09:53:07 2018 +0200
+
+    Logging enhancements
+    
+        * TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp:
+        * TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp:
+        * TAO/orbsvcs/tests/ImplRepo/scale_clients/server.cpp:
+
+commit 9f673be240c9e845ed051d9a225e6729332bf5f8
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 10 09:52:50 2018 +0200
+
+    Added ability to control the server activation mode
+    
+        * TAO/orbsvcs/tests/ImplRepo/scale_clients/README:
+        * TAO/orbsvcs/tests/ImplRepo/scale_clients/run_test.pl:
+
+commit d26426d12efd557b6bb0a2da07adf0d77471f5f6
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 10 09:25:48 2018 +0200
+
+    Logging enhancements
+    
+        * TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp:
+        * TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp:
+        * TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp:
+
+commit 584e9af5b1a9655551f0bcd92b1510631da59ab3
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 10 09:19:34 2018 +0200
+
+    Tab changes and add a -imrdebug commandline argument to set the ImR Locator/Activator log level
+    
+        * TAO/orbsvcs/tests/ImplRepo/scale_clients/README:
+        * TAO/orbsvcs/tests/ImplRepo/scale_clients/run_test.pl:
+
+commit 1f163d5c9ba2bb3764ce1b836a78bf5546a5bd70
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 10 09:04:47 2018 +0200
+
+    Layout changes
+    
+        * TAO/orbsvcs/tests/ImplRepo/double_start/README:
+        * TAO/orbsvcs/tests/ImplRepo/manual_start/README:
+        * TAO/orbsvcs/tests/ImplRepo/scale/client.conf:
+        * TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp:
+        * TAO/orbsvcs/tests/ImplRepo/scale_clients/README:
+        * TAO/orbsvcs/tests/ImplRepo/scale_clients/client.cpp:
+
+commit b708a29934c1707886f0979468c6d5b713c662da
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Aug 10 09:00:45 2018 +0200
+
+    Logging enhancements
+    
+        * TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp:
+        * TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp:
+        * TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp:
+        * TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp:
+
+commit 3dedafeb6acafeb5701375bd765b04357e5a921c
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Aug 9 20:46:56 2018 +0200
+
+    Const and unicode fixes
+    
+        * TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp:
+        * TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp:
+        * TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp:
+        * TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.cpp:
+        * TAO/tao/ImR_Client/ImR_Client.cpp:
+
+commit 5351dea3eb3fd7c32819ada82049403d8cae6a7f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Aug 9 17:05:07 2018 +0200
+
+    Unicode logging fixes
+    
+        * TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp:
+        * TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp:
+        * TAO/orbsvcs/ImplRepo_Service/Replicator.cpp:
+        * TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp:
+
+commit 136779585933c715d25f599be3117c152e06590d
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Aug 9 16:59:11 2018 +0200
+
+    Logging enhancements
+    
+        * TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp:
+
+commit 695b624dedc17593410c5da9461c5b91bd1dc6a8
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Aug 9 16:53:50 2018 +0200
+
+    Indent changes
+    
+        * TAO/orbsvcs/tests/ImplRepo/scale_clients/README:
+
+commit 2a69dbad94ef395afb52bad8fc5bcb970bb3c4bf
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Aug 9 16:53:35 2018 +0200
+
+    Fixed unicode logging error
+    
+        * TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp:
+
+commit 47fe3755c2bd041357b2221dcca9c03a5bc4f064
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Aug 9 16:38:51 2018 +0200
+
+    Log the POA name when we log that we inform the ImR
+    
+        * TAO/tao/ImR_Client/ImR_Client.cpp:
+
+commit a50ed09ff10fa87ff882cf5e9db866a333162e0f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Aug 9 16:28:13 2018 +0200
+
+    Only log when debug is set and simplify logging of commandline
+    
+        * TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp:
+
+commit ac938136f2327c15a229472ba30a564861732535
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Aug 9 16:26:13 2018 +0200
+
+    Use const for a variable we don't change
+    
+        * TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp:
+
+commit 1c5b397ef2b387c1cf1d8f90e73b9b5d86edad9a
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Aug 9 15:33:29 2018 +0200
+
+    Fixed typo in comment
+    
+        * TAO/orbsvcs/ImplRepo_Service/LiveCheck.h:
+
+commit 82fd4e96534ec4ea055e557cdac5aa7da7393ceb
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Aug 9 15:30:40 2018 +0200
+
+    Simplified logging
+    
+        * TAO/tao/ImR_Client/ImR_Client.cpp:
+
+commit 78a0a7d39437c57f68a4a5f1d459d2bf4694bdee
+Merge: b1a50e57b5a 134ed84e9c2
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Aug 9 11:41:59 2018 +0200
+
+    Merge pull request #664 from jwillemsen/jwi-doxygenfixes
+    
+    Doxygen fixes to PortableGroup
+
+commit b1a50e57b5a499472a299a29067e1268adac2359
+Merge: 1c46338c59b beb0ff66f84
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Aug 9 11:40:59 2018 +0200
+
+    Merge pull request #661 from jwillemsen/jwi-corbaomglinks
+    
+    Fixed links to the OMG website
+
+commit 134ed84e9c281a5482b454a0d4ac80344501cf73
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Aug 9 11:05:48 2018 +0200
+
+    Fix doxygen warnings
+    
+        * TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h:
+
+commit f92154b03a1dda2440d9be98219fea996623029b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Aug 9 10:48:41 2018 +0200
+
+    Make x.5.1 public and prepare for the next release
+    
+        * ACE/NEWS:
+        * ACE/bin/diff-builds-and-group-fixed-tests-only.sh:
+        * ACE/docs/Download.html:
+        * ACE/etc/index.html:
+        * TAO/NEWS:
+
+commit beb0ff66f84c1a2d37de0b02bb447468bac903ff
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Aug 7 13:00:05 2018 +0200
+
+    Fixed some more links
+    
+        * TAO/docs/rtcorba/omg_issues.html:
+        * TAO/docs/rtcorba/status.html:
+
+commit 4a32b32d47986c4c017b7da7101e74654fcb5cfa
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Aug 7 12:50:45 2018 +0200
+
+    Fixed links to the OMG website
+    
+        * TAO/docs/rtcorba/status.html:
+        * TAO/tests/RTCORBA/README:
diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM
index ac8c2c3c60c..fac2b5b6d35 100644
--- a/TAO/PROBLEM-REPORT-FORM
+++ b/TAO/PROBLEM-REPORT-FORM
@@ -40,8 +40,8 @@
 To: tao-bugs@list.isis.vanderbilt.edu
 Subject: [area]: [synopsis]
 
-    TAO VERSION: 2.5.1
-    ACE VERSION: 6.5.1
+    TAO VERSION: 2.5.2
+    ACE VERSION: 6.5.2
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/TAO/VERSION b/TAO/VERSION
index e0ce3c8617c..f332d8a2106 100644
--- a/TAO/VERSION
+++ b/TAO/VERSION
@@ -1,4 +1,4 @@
-This is TAO version 2.5.1, released Thu Aug 09 10:43:17 CEST 2018
+This is TAO version 2.5.2, released Tue Sep 18 09:25:49 CEST 2018
 
 If you have any problems with or questions about TAO, please send
 e-mail to the TAO mailing list (tao-bugs@list.isis.vanderbilt.edu),
diff --git a/TAO/tao/Version.h b/TAO/tao/Version.h
index 49d8c7ce557..87760ca851a 100644
--- a/TAO/tao/Version.h
+++ b/TAO/tao/Version.h
@@ -4,9 +4,9 @@
 
 #define TAO_MAJOR_VERSION 2
 #define TAO_MINOR_VERSION 5
-#define TAO_MICRO_VERSION 1
-#define TAO_BETA_VERSION 1
-#define TAO_VERSION "2.5.1"
-#define TAO_VERSION_CODE 132353
+#define TAO_MICRO_VERSION 2
+#define TAO_BETA_VERSION 2
+#define TAO_VERSION "2.5.2"
+#define TAO_VERSION_CODE 132354
 #define TAO_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))