ACE+TAO+CIAO-6_3_3ACE+TAO+CIAO-6_3_3

author: Johnny Willemsen <jwillemsen@remedy.nl> 2015-09-17 08:51:32 +0200
committer: Johnny Willemsen <jwillemsen@remedy.nl> 2015-09-17 08:51:32 +0200
commit: 00c547d2bc3a7e41340c050d832dda34f26e0bdc (patch)
tree: fdbf7b160f581a7e9faef0b03d330923f51014aa
parent: a44a059aea4e965b7a0fb58490fb49e574b6d369 (diff)
download: ATCD-00c547d2bc3a7e41340c050d832dda34f26e0bdc.tar.gz
69 files changed, 1505 insertions, 75 deletions
diff --git a/ACE/ChangeLogs/ACE-6_3_3 b/ACE/ChangeLogs/ACE-6_3_3
new file mode 100644
index 00000000000..56f1b2b957e
--- /dev/null
+++ b/ACE/ChangeLogs/ACE-6_3_3
@@ -0,0 +1,697 @@
+commit bb08a81357f6b7e87aafb1807d114b945552c11b
+Author: Phil Mesnier <mesnierp@ociweb.com>
+Date:   Wed Sep 16 16:25:36 2015 -0500
+
+    update NEWS, putting TAO notes in the correct file
+
+commit 9b0d572eac0fe89c731d0b4d537fc02a02f4c694
+Author: Phil Mesnier <mesnierp@ociweb.com>
+Date:   Wed Sep 16 13:59:48 2015 -0500
+
+    update NEWS
+
+commit 8b0ee3b9d25f29c23bb13919865d6b8266faa5d2
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Sep 16 08:55:38 2015 +0200
+
+    Revert "Fix connecting timeout without returning -1 in ACE_Cached_Connect_Strategy_T"
+
+commit 784e8c92244dc081bef3d7ac6ba5ddc0d720474b
+Merge: 006534e 5100781
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Sep 15 18:26:56 2015 +0200
+
+    Merge branch 'master' of git://github.com/DOCGroup/ATCD
+
+commit 006534e2c5070472f5ae630018a904191dbf42a1
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Sep 15 18:26:19 2015 +0200
+
+    Use separate instead of seperate
+        * ACE/ace/Functor_String.h:
+        * ACE/ace/WFMO_Reactor.h:
+        * ACE/tests/Env_Value_Test.cpp:
+        * ACE/tests/Proactor_Scatter_Gather_Test.cpp:
+        * ACE/tests/Service_Config_DLL.h:
+        * CIAO/docs/TODO.html:
+        * DAnCE/dance/DAnCE_LocalityManager.idl:
+        * TAO/TAO-INSTALL.html:
+        * TAO/docs/releasenotes/index.html:
+        * TAO/examples/AMH/Sink_Server/Base_Server.h:
+        * TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h:
+        * TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.h:
+        * TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp:
+        * TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.h:
+        * TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp:
+        * TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h:
+        * TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp:
+        * TAO/tao/Asynch_Reply_Dispatcher_Base.cpp:
+        * TAO/tao/GIOP_Message_Base.cpp:
+        * TAO/tao/ORB_Core.cpp:
+        * TAO/tao/Remote_Invocation.cpp:
+        * TAO/tao/Transport_Connector.cpp:
+        * TAO/tao/params.cpp:
+        * TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.h:
+
+commit 51007817985b0c4eb361d567929be02d2f1b9109
+Merge: 7809d18 2a15b7e
+Author: Steve Huston <shuston@riverace.com>
+Date:   Tue Sep 15 11:08:08 2015 -0400
+
+    Merge pull request #45 from likema/feature/fix-cached-connect-return-code
+    
+    Fix connecting timeout without returning -1 in ACE_Cached_Connect_Strategy_T
+
+commit 98a1a5b72caee91fe080503dc8ad1a044fd35749
+Author: Felix Bünemann <buenemann@louis.info>
+Date:   Mon Sep 14 18:49:46 2015 +0200
+
+    Add ACE support for MacOS X 10.11 El Capitan
+
+commit 469dbb215ee76dce382038a179847f4ecb6c65a5
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Sep 11 21:03:29 2015 +0200
+
+    Updated old email addresses
+        * ACE/ace/config-kfreebsd.h:
+        * ACE/docs/ACE-guidelines.html:
+        * ACE/docs/ACE-subsets.html:
+        * TAO/docs/implrepo/paper.html:
+        * TAO/docs/minimumTAO.html:
+
+commit 133850bf8c710a14fd0600060b1ab75c10b7e36a
+Merge: 2a231f8 99c0673
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Wed Sep 9 10:43:26 2015 -0500
+
+    Merge pull request #130 from iamtheschmitzer/master
+    
+    make fuzz.pl -m work for GIT repos also
+
+commit 46dae9e6dcf5bfd00096b6e9f24cced71df9e28a
+Author: Phil Mesnier <mesnierp@ociweb.com>
+Date:   Wed Sep 9 06:22:34 2015 -0500
+
+    fix for setting port number on an ACE_INET_Addr with a non-empty inet_addrs_ list.
+
+commit 2a15b7ef22158c98c28c04fc7699b47aa3e097c0
+Author: Like Ma <likemartinma@gmail.com>
+Date:   Mon Sep 7 10:47:53 2015 +0800
+
+    Add Cached_Conn_Strategy_Fail_Test into tests/run_test.lst
+
+commit abb7f56a6cc6bace6ccceaa415dde311d63e9ce1
+Author: Martin Corino <mcorino@remedy.nl>
+Date:   Mon Aug 31 10:51:10 2015 +0200
+
+    Fix incorrect buffer access.
+    
+        * ACE/protocols/ace/INet/BufferedStreamBuffer.cpp:
+
+commit 392bd7909440c44c5b961fecef14f6e92a4f9889
+Author: Martin Corino <mcorino@remedy.nl>
+Date:   Mon Aug 31 08:16:11 2015 +0200
+
+    Plug another hole. Correct state comparison.
+    
+        * ACE/protocols/ace/INet/ClientRequestHandler.cpp:
+        * ACE/protocols/ace/INet/ClientRequestHandler.h:
+          Revert unnecessary singleton export.
+    
+        * ACE/protocols/ace/INet/ConnectionCache.cpp:
+
+commit 99f34e144b81cd42152df1d1e07d39a37b00c0ab
+Author: Martin Corino <mcorino@remedy.nl>
+Date:   Sun Aug 30 12:52:17 2015 +0200
+
+    Fix incorrect macro use.
+    
+        * ACE/protocols/ace/INet/ClientRequestHandler.cpp:
+
+commit 9110555c863b7c49e9fa9e50dfb13fecfefdc660
+Author: Martin Corino <mcorino@remedy.nl>
+Date:   Sun Aug 30 12:00:21 2015 +0200
+
+    Fix singleton exports.
+    
+        * ACE/protocols/ace/INet/ClientRequestHandler.cpp:
+        * ACE/protocols/ace/INet/ClientRequestHandler.h:
+
+commit 29251f7f353f03eca7675ff30703fb9e5ee35725
+Author: Martin Corino <mcorino@remedy.nl>
+Date:   Sun Aug 30 11:44:19 2015 +0200
+
+    Plug a hole. Add missing dtor to clean up.
+    
+        * ACE/protocols/ace/INet/ConnectionCache.cpp:
+        * ACE/protocols/ace/INet/ConnectionCache.h:
+
+commit d9b48d61fcd21a29e1769f5b0e27a590c7e7819f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Aug 27 19:02:49 2015 +0200
+
+    Upgrade to newer doxygen
+        * ACE/etc/ace.doxygen:
+
+commit 99c0673e9717753033d328625110fc08e5601ebc
+Author: Jeff Schmitz <jeffrey.j.schmitz@gmail.com>
+Date:   Tue Aug 18 09:43:05 2015 -0500
+
+    make fuzz.pl -m work for GIT repos also
+
+commit 29c32167113d58737826d774ff248982c220e653
+Author: Phil Mesnier <mesnier_p@ociweb.com>
+Date:   Tue Aug 4 09:11:45 2015 -0500
+
+    fix for bug 4205
+
+commit 10d715e89013186abbc5d7eac535f8cb7c83489c
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Jul 22 16:08:46 2015 +0200
+
+    Also use =delete with Visual Studio 2015
+        * ACE/ace/Global_Macros.h:
+
+commit 8430ff7587150f24d6a050e0ec3e06659c8c3117
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Jul 22 16:08:30 2015 +0200
+
+    Reapply workaround for Visual Studio 2015, not fixed in the final release
+        * ACE/tests/Compiler_Features_27_Test.cpp:
+
+commit bcd30c56f7ef39674a82eb29aa52e9284b923b7e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Jul 22 11:05:34 2015 +0200
+
+    Removed workaround for msvc14 RC
+        * ACE/tests/Compiler_Features_27_Test.cpp:
+
+commit 0f745de1a4b3133f508729e9a7b1328bb8cac884
+Author: Phil Mesnier <mesnier_p@ociweb.com>
+Date:   Mon Jul 6 17:01:44 2015 -0500
+
+    Add required explicit include as identified by VC12.
+
+commit bde47e74c5571ce65d3550ad47f18b134e88c94f
+Merge: d1888c8 2aa6b42
+Author: Steve Huston <shuston@riverace.com>
+Date:   Wed Jul 1 18:23:33 2015 -0400
+
+    Merge pull request #43 from likema/feature/aix5.1
+    
+    feature/aix5.1
+
+commit d1888c8fc434c9d8250d525a74a4bd8aa948d5bf
+Merge: 6d42324 ea28a54
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jun 30 13:08:06 2015 +0200
+
+    Merge pull request #107 from jwillemsen/jwi-feature-cpp11-chrono-reactor
+    
+    Added support to schedule and reset timers using std::chrono::duratio…
+
+commit 6d423246e5b09cedddd4bdeccfe5b716c0c64195
+Merge: d2b8229 64ee27f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jun 30 13:07:25 2015 +0200
+
+    Merge pull request #106 from jwillemsen/jwi-cpp11_processmanager-wait
+    
+    Added support to use the wait operations of the ACE process manager u…
+
+commit ea28a545402c6766a376b81ebe0922d0a0ab1d19
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jun 30 09:21:29 2015 +0200
+
+    Added support to schedule and reset timers using std::chrono::duration at the moment C++11 support is available
+        * ACE/ace/Reactor.h:
+        * ACE/ace/Reactor_Timer_Interface.h:
+        * ACE/tests/Reactor_Timer_Test.cpp:
+
+commit 64ee27f10bdffeb044559503039cc6bf1bc70fe2
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jun 30 08:38:22 2015 +0200
+
+    Revert one test case
+        * ACE/tests/Process_Manager_Test.cpp:
+
+commit ce529b4bc2b80e512f6146c36320e86ace287716
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jun 29 19:52:49 2015 +0200
+
+    Added support to use the wait operations of the ACE process manager using std::chrono::duration as alternative to ACE_Time_Value
+        * ACE/ace/Process_Manager.h:
+        * ACE/tests/Process_Manager_Test.cpp:
+
+commit b997e3306c121a2c9c3f598c067cdb48c6d5e6eb
+Author: Justin Wilson <wilsonj@ociweb.com>
+Date:   Mon Jun 29 08:37:58 2015 -0500
+
+    Fix conversion warnings.
+
+commit 4c426c4597dae76475eea85d8c130d56142d1032
+Author: Justin Wilson <wilsonj@ociweb.com>
+Date:   Thu Jun 25 14:41:30 2015 -0500
+
+    Fix compiler warnings and failing unit tests.
+
+commit 4bc46d9d28b19bbcb52c43d7a89a588c39098936
+Author: Justin Wilson <wilsonj@ociweb.com>
+Date:   Thu Jun 11 10:48:05 2015 -0500
+
+    Rewrote normalize to fix off-by-one error.  Fixed bug in division and added test.
+
+commit 9a7f51508f6b16367adb043e44d26aff6d265239
+Merge: 0514e70 9ec2d24
+Author: Phil Mesnier <mesnier_p@ociweb.com>
+Date:   Fri Jun 26 08:35:28 2015 -0500
+
+    Merge pull request #102 from DOCGroup/revert-96-master
+    
+    Revert "Rewrote normalize to fix off-by-one error.  Fixed bug in divi…
+
+commit bfca83a85103a76bd4058697204ba063f1b2f9e6
+Merge: 99c243c fba94d0
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jun 26 13:35:00 2015 +0200
+
+    Merge branch 'master' of git://github.com/DOCGroup/ATCD
+    
+    Conflicts:
+    	ACE/NEWS
+
+commit 99c243c3bdd0b9994bb5ed432e712969af48247f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jun 26 13:34:36 2015 +0200
+
+    Mention end of OpenVMS daily maintenance
+        * ACE/NEWS:
+
+commit 9ec2d24abd4b99f6a0233b1ec9b87f527267e563
+Author: Phil Mesnier <mesnier_p@ociweb.com>
+Date:   Thu Jun 25 12:43:02 2015 -0500
+
+    Revert "Rewrote normalize to fix off-by-one error.  Fixed bug in division and added test."
+
+commit 2aa6b42fa27706a8103c1233d4cbe0164eba7f32
+Author: Like Ma <likemartinma@gmail.com>
+Date:   Fri Jun 26 01:22:59 2015 +0800
+
+    Remove $Id$.
+
+commit e972985eee19a0c0894a5865ae32acedf417dea3
+Author: Like Ma <likemartinma@gmail.com>
+Date:   Fri Jun 26 01:22:22 2015 +0800
+
+    Protect AIX 5.1 lack features.
+
+commit fba94d061ecdf31bf853f1c7a52bba7f54429e25
+Merge: b589dc3 ceb825a
+Author: Phil Mesnier <mesnier_p@ociweb.com>
+Date:   Wed Jun 24 09:18:27 2015 -0500
+
+    Merge pull request #96 from jrw972/master
+    
+    Rewrote normalize to fix off-by-one error.  Fixed bug in division and added test.
+    This only impacts the new Fixed type.
+
+commit 999fa10b949cb90f86dc8095fff0a5d549a5f910
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Thu Jun 18 13:46:55 2015 -0500
+
+    NEWS entry for VxWorks 7
+
+commit 960cbf4485832a0efda67d62fca20ccbe1153f13
+Merge: 70dbf3e 335210e
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Thu Jun 18 11:11:10 2015 -0500
+
+    Merge remote-tracking branch 'origin/master' into VxWorks7
+
+commit 70dbf3eaa502ada6723ee70bc5f1cdbc38990776
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Thu Jun 18 11:09:59 2015 -0500
+
+    Allow the INSLIB make variable to empty.
+
+commit c851103ff4dc66b76a3071ee88a6c28d93db756c
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Jun 18 14:03:40 2015 +0200
+
+    Updated news file
+        * ACE/NEWS:
+
+commit 78cc1a6348d9e7041dd4179796cc2bcbc56d311b
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Tue Jun 16 12:28:20 2015 -0500
+
+    Use -static when linking VxWorks 7 static RTPs.
+    
+    This allows the same lib dir to have libFoo.a and libFoo.so, and the linker
+    will select libFoo.a due to -static.
+
+commit 380e05ec176c6adf52dabf358a80159893d1db1a
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Mon Jun 15 16:14:04 2015 -0500
+
+    Allow VxWorks kernel DKMs to be built in other directories.
+
+commit 4f176a53eb6d2fbe24bfc2b3fd7fa57fb47a128a
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Mon Jun 15 10:38:48 2015 -0500
+
+    Support for VxWorks 7.0 kernel mode.
+
+commit 20cf91a8349ef44cba4b01d31d2bea07b2204ec7
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Fri Jun 12 12:48:23 2015 -0500
+
+    Added support for VxWorks 7 kernel mode.
+
+commit 9347add1c3faf5773eec2373b58e7e2569472254
+Merge: 6b75144 37e576e
+Author: Steve Huston <shuston@riverace.com>
+Date:   Thu Jun 11 15:16:05 2015 -0400
+
+    Merge pull request #98 from DOCGroup/BZ4204
+    
+    MKDIR on the install dirs as needed - fixes Bugzilla 4204
+
+commit 37e576ee1ec440fb836dd22174bfb6347fb64487
+Author: Steve Huston <shuston@riverace.com>
+Date:   Thu Jun 11 14:39:21 2015 -0400
+
+    MKDIR on the install dirs as needed - fixes Bugzilla 4204
+
+commit 95aa0bfccda0da42e5bf1850aaff5fd96a278c19
+Author: Steve Huston <shuston@riverace.com>
+Date:   Thu Jun 11 12:22:44 2015 -0400
+
+    Use OBJEXT instead of .o - fixes Bugzilla 4203
+
+commit ceb825a446f74288f4bdb66170aaba8e096996f5
+Author: Justin Wilson <wilsonj@ociweb.com>
+Date:   Thu Jun 11 10:48:05 2015 -0500
+
+    Rewrote normalize to fix off-by-one error.  Fixed bug in division and added test.
+
+commit 8de0874bd988aaf3989cc1ac27584b4d88d1ceff
+Merge: 4c30956 1a8fff41
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Tue Jun 9 16:21:10 2015 -0500
+
+    Merge remote-tracking branch 'origin/master' into VxWorks7
+
+commit 4c309562d826575f4a16c886768b10a60e5cf1df
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Tue Jun 9 15:23:39 2015 -0500
+
+    Settings for reducing dependencies on Linux system libraries.
+    
+    Building with these options and other related settings in platform_macros.GNU,
+    one can create executables that can run on older Linux distros.
+
+commit 243dc9722b6c0914335e5af53148c44d659c820e
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Tue Jun 9 15:23:29 2015 -0500
+
+    Fixed typo in comment
+
+commit 20efa1b185d5a9aa938a321b712a00d55c46dce3
+Author: sphawk <sphawk@nate.com>
+Date:   Fri Jun 5 20:47:04 2015 +0900
+
+    fix compile error for ssl (MAXHOSTNAMELEN missing)
+
+commit c0f166c8ef8638e9331b706e8ccf5c679a013f7e
+Author: Phil Mesnier <mesnier_p@ociweb.com>
+Date:   Thu Jun 4 14:19:31 2015 -0500
+
+    Applying Cesar Mello's fix for wchar IFR build
+
+commit 9fd86dc7a42aea70ea0fec17286c16e27d05e818
+Author: Martin Corino <mcorino@remedy.nl>
+Date:   Tue Jun 2 10:53:22 2015 +0200
+
+    Prevent macro redefinitions with MSVC14.
+    
+        * ACE/ace/config-win32-msvc.h:
+
+commit 636d2e64ab16a78bb6e281326ef6bcf69ca08081
+Merge: d933f8a e23f049
+Author: Martin Corino <mcorino@remedy.nl>
+Date:   Sun May 31 10:25:27 2015 +0200
+
+    Merge branch 'master' of https://github.com/mcorino/ATCD
+
+commit d933f8a18bf2bfc2165183bee3772308416fd140
+Author: Martin Corino <mcorino@remedy.nl>
+Date:   Sun May 31 10:25:14 2015 +0200
+
+    Oops. Fix MSVC pragma warning syntax.
+    
+        * ACE/ace/OS_NS_sys_utsname.cpp:
+        * ACE/ace/Object_Manager_Base.cpp:
+
+commit f9ce7915129d21d0deb9a5ead23cd17831310518
+Merge: aef72ee 87a419c
+Author: mcorino <mcorino@remedy.nl>
+Date:   Sat May 30 17:41:16 2015 +0200
+
+    Merge pull request #86 from mcorino/master
+    
+    Fix incorrect MSVC pragma warning format.
+
+commit 87a419ccb20491fa65e86963c73afe6730a59001
+Author: Martin Corino <mcorino@remedy.nl>
+Date:   Sat May 30 17:38:15 2015 +0200
+
+    Fix incorrect MSVC pragma warning format.
+    
+        * ACE/ace/OS_NS_sys_utsname.cpp:
+        * ACE/ace/Object_Manager_Base.cpp:
+
+commit 432e6627b94fbd397e4374105b4403248be2066b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri May 29 08:09:03 2015 +0200
+
+    Fixed missing include
+        * ACE/apps/gperf/src/List_Node.cpp:
+
+commit 4cc58ce93b93e07f2d73228ad7c621c7fccbd2f6
+Author: Martin Corino <mcorino@remedy.nl>
+Date:   Thu May 28 13:43:18 2015 +0200
+
+    Changes to fix integer type  conversion warnings.
+    
+        * ACE/ace/ETCL/ETCL_y.cpp:
+        * ACE/ace/XML_Utils/XercesString.cpp:
+        * ACE/apps/gperf/src/Gen_Perf.cpp:
+        * ACE/apps/gperf/src/List_Node.cpp:
+        * ACE/apps/gperf/src/Options.cpp:
+
+commit a94947b7106d3da8ea549c730629553ac4d4c3a0
+Author: Martin Corino <mcorino@remedy.nl>
+Date:   Thu May 28 13:29:15 2015 +0200
+
+    Changes to fix compile warnings as result of deprecation Win32 GetVersion API.
+    
+        * ACE/ace/OS_NS_sys_utsname.cpp:
+        * ACE/ace/Object_Manager_Base.cpp:
+        * ACE/ace/config-win32-common.h:
+
+commit b5c13e8692f545594c42a1ceb0b89dd2610f5fb2
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Tue May 26 14:01:50 2015 -0500
+
+    Set EXEEXT for VxWorks
+
+commit 999e4568b6b995df93d5d703f9ef0fe3b9ccbbe7
+Author: Like Ma <likemartinma@gmail.com>
+Date:   Tue May 26 23:18:27 2015 +0800
+
+    Add unit test for ACE_Cached_Connect_Strategy_T connecting timeout.
+
+commit 8fa9d6678bb5b90f26a55d60b87d20fca71cd44e
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Fri May 22 18:03:36 2015 -0500
+
+    Cleaned up comments
+
+commit 1a9551dd3f1b49ab90bebc6d28aceb698e96ad9c
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Fri May 22 17:58:17 2015 -0500
+
+    Add -non-static when linking an RTP with shared libs.
+
+commit 49279311637960ce259ab32e2fc03775fdb5c161
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Fri May 22 17:08:16 2015 -0500
+
+    Configuration files for VxWorks 7.
+    
+    Tested x86 RTP shared libs.
+
+commit 7b4773454758486a1e0efc48f7bd08c200b4c051
+Author: Martin Corino <mcorino@remedy.nl>
+Date:   Thu May 21 08:07:37 2015 +0200
+
+    Add include for ACE_OS::sleep.
+
+commit 1a47c6956c0d369e10a7431e2650a19d0c679372
+Author: Martin Corino <mcorino@remedy.nl>
+Date:   Wed May 20 12:13:59 2015 +0200
+
+    Added new test for task grp_id handling.
+
+commit ec6f20a8ca583815a397de4f0085786199120b12
+Author: Martin Corino <mcorino@remedy.nl>
+Date:   Wed May 20 10:40:43 2015 +0200
+
+    Removed trailing whitespace.
+
+commit 68d717f0575e13550df7d5044403e2b983318481
+Author: Martin Corino <mcorino@remedy.nl>
+Date:   Tue May 19 15:51:39 2015 +0200
+
+    Make the group id handling more consistent.
+
+commit a69317924b6b5b60085c87b694f9337e57a377a2
+Merge: 9ca96f7 e86b6d0
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sun May 17 19:58:13 2015 +0200
+
+    Merge pull request #80 from jwillemsen/master
+    
+    Use add_compile instead of addcompile
+
+commit e86b6d0c60dc422878d4d23422eae708a1779c86
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sun May 17 19:57:51 2015 +0200
+
+    Use add_compile instead of addcompile
+        * ACE/bin/MakeProjectCreator/config/vc14nmake.mpb:
+        * ACE/bin/MakeProjectCreator/config/vc9nmake.mpb:
+
+commit 9ca96f7dad4827185a74e8859892e192211b5b19
+Merge: bd5084b 4f9054d
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sun May 17 09:16:15 2015 +0200
+
+    Merge pull request #79 from jwillemsen/master
+
+commit bd5084bffc2940ce1155ee0ae0ccccc36efeaad6
+Author: Steve Huston <shuston@riverace.com>
+Date:   Sat May 16 18:19:13 2015 -0400
+
+    Adjust logging to help diagnose things
+
+commit 4f9054decf2026decd0340a54b461fffc73058e4
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri May 15 10:56:11 2015 +0200
+
+    Package vc12 and vc14 solutions
+        * ACE/NEWS:
+        * ACE/bin/make_release.py:
+
+commit 66069eed4dcf9a13f482fa8ae985281529c0b280
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Thu May 14 11:02:23 2015 -0500
+
+    Fixed bug in excluding certain files from release packages.
+
+commit c456315e3e91199fd28706253598c2800cf60f4c
+Merge: 1a9ce1f 2a152dd
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Wed May 13 17:46:49 2015 -0500
+
+    Merge branch 'gitignore_release'
+
+commit 57397b45b69524f4493d63ee951e9badcd3a4ea4
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Mon May 11 15:22:12 2015 -0500
+
+    Fixed coverity issues 1297401 and 1297404
+
+commit 2a152dd9eefc1dfbc5043e8279a83c24dfcf45ea
+Merge: 68e9480 32e3e82
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Mon May 11 15:26:36 2015 -0500
+
+    Merge commit '32e3e82ef65c5b1b47163853c3c1fc062b0fafe6' into coverity
+
+commit 5a13bf268fc4f3502d289a613d3e90f7b9f19883
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri May 8 09:00:21 2015 +0200
+
+    Enable ACE_HAS_CPP11 for Visual Studio 2015, but disable part
+    of compiler feature test 27, that will be fixed in the final
+    release
+        * ACE/NEWS:
+        * ACE/ace/config-win32-msvc-14.h:
+        * ACE/tests/Compiler_Features_27_Test.cpp:
+
+commit 32e3e82ef65c5b1b47163853c3c1fc062b0fafe6
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Mon Mar 2 13:47:35 2015 -0600
+
+    Exclude .gitignore files from release packages.
+
+commit 92811a82a2ddd0d975f7cae040e81c833d640f86
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Thu May 7 09:43:44 2015 -0500
+
+    Updated .gitignore for ACE tests.
+
+commit 541dc7f089619c59447020906764783a0acea1d3
+Merge: 59e037d 36f1ecd
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu May 7 13:22:43 2015 +0200
+
+    Merge pull request #74 from jwillemsen/master
+    
+    Make x.3.2 public and prepare for x.3.3
+
+commit 36f1ecd6eb1defa405372adb5f4075049e2a74e9
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu May 7 10:56:48 2015 +0200
+
+    Added link for 6.3.2 doxygen documentation
+        * ACE/etc/index.html:
+
+commit 049c2cbbb808ca8a8ae30e3a33321397fe69bd74
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu May 7 10:33:17 2015 +0200
+
+    Make x.3.2 public and prepare for next release
+        * ACE/NEWS:
+        * ACE/bin/diff-builds-and-group-fixed-tests-only.sh:
+        * ACE/docs/Download.html:
+        * ACE/docs/bczar/bczar.html:
+        * CIAO/NEWS:
+        * DAnCE/NEWS:
+        * TAO/NEWS:
+
+commit 5f837b5430465967e2e1abf2f0fa64a0c41de22a
+Author: Like Ma <likemartinma@gmail.com>
+Date:   Thu Mar 26 09:26:12 2015 +0800
+
+    Use FLAGS_C_CC instead of CFLAGS in AIX makefile.
+
+commit c3bb78b8cd08ebf3b40521054c8f47a30d6fc000
+Author: Like Ma <likemartinma@gmail.com>
+Date:   Mon Mar 23 01:31:15 2015 +0800
+
+    Fix connecting timeout without returning -1 in ACE_Cached_Connect_Strategy_T
+
+commit 342e3ea8933d1e3d79c833853fb78270b0e6ff7b
+Author: Like Ma <likemartinma@gmail.com>
+Date:   Sun Mar 22 02:39:54 2015 +0800
+
+    Fix lack of unsetenv, log2 and pthread_attr_setstack in AIX 5.1
+
+commit e7a2a824a4ed1164792551dfa370fd319a402caf
+Author: Like Ma <likemartinma@gmail.com>
+Date:   Sat Mar 14 15:31:52 2015 +0800
+
+    Fix GCC 4.5.4 AIX 5.1 warnings of size_t and ssize_t format.
diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM
index fcb4ccb1fc5..3f59218cf51 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.3.2
+    ACE VERSION: 6.3.3
 
     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 db1805dc4a8..e445735f338 100644
--- a/ACE/VERSION
+++ b/ACE/VERSION
@@ -1,4 +1,4 @@
-This is ACE version 6.3.2, released Thu May 07 10:14:44 CEST 2015
+This is ACE version 6.3.3, released Thu Sep 17 08:51:30 CEST 2015
 
 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 b09b4b1fe0a..7aba25b9c9a 100644
--- a/ACE/ace/Version.h
+++ b/ACE/ace/Version.h
@@ -4,5 +4,5 @@
 
 #define ACE_MAJOR_VERSION 6
 #define ACE_MINOR_VERSION 3
-#define ACE_BETA_VERSION 2
-#define ACE_VERSION "6.3.2"
+#define ACE_BETA_VERSION 3
+#define ACE_VERSION "6.3.3"
diff --git a/ACE/debian/ace.dsc b/ACE/debian/ace.dsc
index 35bcf287565..9f36b82960e 100644
--- a/ACE/debian/ace.dsc
+++ b/ACE/debian/ace.dsc
@@ -1,10 +1,10 @@
 Format: 1.0
-Source: ACE+TAO+CIAO-src-6.3.2
-Version: 2.3.2
+Source: ACE+TAO+CIAO-src-6.3.3
+Version: 2.3.3
 Binary: ace
 Maintainer: Johnny Willemsen  <jwillemsen@remedy.nl>
 Architecture: any
 Build-Depends: gcc, make, g++, debhelper (>= 5), dpkg-dev, libssl-dev (>= 0.9.7d), dpatch (>= 2.0.10), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev (>= 4.4~rc1-4), tk-dev, zlib1g-dev, docbook-to-man, bzip2, autoconf, automake, libtool, autotools-dev, doxygen, graphviz, libfox-1.6-dev, libzzip-dev, libbz2-dev
 Files:
- 65b34001c9605f056713a7e146b052d1 46346654 ACE+TAO+CIAO-src-6.3.2.tar.gz
+ 65b34001c9605f056713a7e146b052d1 46346654 ACE+TAO+CIAO-src-6.3.3.tar.gz
 
diff --git a/ACE/debian/debian.control b/ACE/debian/debian.control
index ece5637b77f..24d003ccc09 100644
--- a/ACE/debian/debian.control
+++ b/ACE/debian/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.3.2
+Package: libace-6.3.3
 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.3.2 (= ${binary:Version}), ${misc:Depends}
+Depends: libace-6.3.3 (= ${binary:Version}), ${misc:Depends}
 Suggests: libace-doc, libtao-dev, 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.3.2
+Package: libace-ssl-6.3.3
 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.2.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev (>= 6.3.2d), ${misc:Depends}
+Depends: libace-ssl-6.2.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev (>= 6.3.3d), ${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.3.2
+Package: libace-rmcast-6.3.3
 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.3.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-rmcast-6.3.3 (= ${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.3.2
+Package: libace-tmcast-6.3.3
 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.3.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-tmcast-6.3.3 (= ${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.3.2
+Package: libace-htbp-6.3.3
 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.3.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-htbp-6.3.3 (= ${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.3.2
+Package: libace-inet-6.3.3
 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.3.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-6.3.3 (= ${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.3.2
+Package: libace-inet-ssl-6.3.3
 Architecture: any
 Section: libs
-Depends: libace-inet-6.2.7, libace-ssl-6.3.2, ${shlibs:Depends}, ${misc:Depends}
+Depends: libace-inet-6.2.7, libace-ssl-6.3.3, ${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.3.2 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-ssl-6.3.3 (= ${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.
@@ -190,7 +190,7 @@ Description: ACE perfect hash function generator (transitional package)
  .
  It can be safely removed after installation.
 
-Package: libacexml-6.3.2
+Package: libacexml-6.3.3
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -206,12 +206,12 @@ Package: libacexml-dev
 Architecture: any
 Section: libdevel
 Replaces: libace-dev (<< 5.7.7-4)
-Depends: libacexml-6.3.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libacexml-6.3.3 (= ${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.3.2
+Package: libace-xml-utils-6.3.3
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -225,16 +225,16 @@ Package: libace-xml-utils-dev
 Architecture: any
 Section: libdevel
 Replaces: libace-dev (<< 5.7.7-4)
-Depends: libace-xml-utils-6.3.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev
+Depends: libace-xml-utils-6.3.3 (= ${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.3.2
+Package: libkokyu-6.3.3
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: libtao-2.2.7, libtao-orbsvcs-2.3.2
+Suggests: libtao-2.2.7, libtao-orbsvcs-2.3.3
 Description: ACE scheduling and dispatching library
  Kokyu is a library designed to provide flexible scheduling and
  dispatching services.
@@ -245,12 +245,12 @@ Description: ACE scheduling and dispatching library
 Package: libkokyu-dev
 Architecture: any
 Section: libdevel
-Depends: libkokyu-6.3.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libkokyu-6.3.3 (= ${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-qtreactor-6.3.2
+Package: libace-qtreactor-6.3.3
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -269,12 +269,12 @@ Description: ACE-GUI reactor integration for Qt
 Package: libace-qtreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-qtreactor-6.3.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), libqt4-dev, ${misc:Depends}
+Depends: libace-qtreactor-6.3.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libqt4-dev, ${misc:Depends}
 Description: ACE-GUI reactor integration for Qt - development files
  This package contains header files and static library for the ACE-Qt
  reactor integration.
 
-Package: libace-xtreactor-6.3.2
+Package: libace-xtreactor-6.3.3
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -292,12 +292,12 @@ Description: ACE-GUI reactor integration for Xt
 Package: libace-xtreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-xtreactor-6.2.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 6.3.2), ${misc:Depends}
+Depends: libace-xtreactor-6.2.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 6.3.3), ${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.3.2
+Package: libace-tkreactor-6.3.3
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -316,12 +316,12 @@ Description: ACE-GUI reactor integration for Tk
 Package: libace-tkreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-tkreactor-6.3.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends}
+Depends: libace-tkreactor-6.3.3 (= ${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.3.2
+Package: libace-flreactor-6.3.3
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -339,12 +339,12 @@ Description: ACE-GUI reactor integration for FLTK
 Package: libace-flreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-flreactor-6.2.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 6.3.2), ${misc:Depends}
+Depends: libace-flreactor-6.2.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 6.3.3), ${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.3.2
+Package: libace-foxreactor-6.3.3
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -361,12 +361,12 @@ Description: ACE-GUI reactor integration for FOX
 Package: libace-foxreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-foxreactor-6.3.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
+Depends: libace-foxreactor-6.3.3 (= ${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.
 
-Package: libtao-2.3.2
+Package: libtao-2.3.3
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -381,7 +381,7 @@ Package: libtao-dev
 Architecture: any
 Section: libdevel
 Replaces: libtao-orbsvcs-dev (<< 5.7.7-4)
-Depends: libtao-2.3.2 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libtao-2.3.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Suggests: libtao-doc, libtao-orbsvcs-dev
 Description: ACE based CORBA ORB core libraries - development files
  This package contains the header files for TAO. Due to the size of
@@ -397,7 +397,7 @@ Description: ACE based CORBA ORB core libraries - documentation
  This package contains the TAO overview documentation, tutorials,
  examples, and information regarding upstream development.
 
-Package: libtao-orbsvcs-2.3.2
+Package: libtao-orbsvcs-2.3.3
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -408,14 +408,14 @@ Package: libtao-orbsvcs-dev
 Architecture: any
 Section: libdevel
 Replaces: libtao-dev (<< 5.7.7-4)
-Depends: libtao-orbsvcs-2.3.2 (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libtao-orbsvcs-2.3.3 (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
 Description: TAO CORBA services - development files
  This package contains the header files for the TAO CORBA services.
  .
  The examples and some documentation have been included as well, but the
  static libraries have been left out due to their size (over 400MB).
 
-Package: libtao-qtresource-2.3.2
+Package: libtao-qtresource-2.3.3
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -426,12 +426,12 @@ Description: TAO-GUI reactor integration for Qt
 Package: libtao-qtresource-dev
 Architecture: any
 Section: libdevel
-Depends: libtao-qtresource-2.3.2 (= ${binary:Version}), libace-qtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libtao-qtresource-2.3.3 (= ${binary:Version}), libace-qtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
 Description: TAO-GUI reactor integration for Qt - development files
  This package contains header files and static library for the TAO-Qt
  reactor integration.
 
-Package: libtao-xtresource-2.3.2
+Package: libtao-xtresource-2.3.3
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -442,12 +442,12 @@ Description: TAO-GUI reactor integration for Xt
 Package: libtao-xtresource-dev
 Architecture: any
 Section: libdevel
-Depends: libtao-xtresource-2.3.2 (= ${binary:Version}), libace-xtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libtao-xtresource-2.3.3 (= ${binary:Version}), libace-xtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
 Description: TAO-GUI reactor integration for Xt - development files
  This package contains header files and static library for the TAO-Xt
  reactor integration.
 
-Package: libtao-flresource-2.3.2
+Package: libtao-flresource-2.3.3
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -458,12 +458,12 @@ Description: TAO-GUI reactor integration for FLTK
 Package: libtao-flresource-dev
 Architecture: any
 Section: libdevel
-Depends: libtao-flresource-2.3.2 (= ${binary:Version}), libace-flreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libtao-flresource-2.3.3 (= ${binary:Version}), libace-flreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
 Description: TAO-GUI reactor integration for FLTK - development files
  This package contains header files and static library for the TAO-FLTK
  reactor integration.
 
-Package: libtao-tkresource-2.3.2
+Package: libtao-tkresource-2.3.3
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -474,12 +474,12 @@ Description: TAO-GUI reactor integration for Tk
 Package: libtao-tkresource-dev
 Architecture: any
 Section: libdevel
-Depends: libtao-tkresource-2.3.2 (= ${binary:Version}), libace-tkreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libtao-tkresource-2.3.3 (= ${binary:Version}), libace-tkreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
 Description: TAO-GUI reactor integration for Tk - development files
  This package contains header files and static library for the TAO-Tk
  reactor integration.
 
-Package: libtao-foxresource-2.3.2
+Package: libtao-foxresource-2.3.3
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -490,14 +490,14 @@ Description: TAO-GUI reactor integration for FOX
 Package: libtao-foxresource-dev
 Architecture: any
 Section: libdevel
-Depends: libtao-foxresource-2.3.2 (= ${binary:Version}), libace-foxreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libtao-foxresource-2.3.3 (= ${binary:Version}), libace-foxreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
 Description: TAO-GUI reactor integration for FOX - development files
  This package contains header files and static library for the TAO-FOX
  reactor integration.
 
 Package: tao-idl
 Architecture: any
-Depends: g++, libtao-2.3.2 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: g++, libtao-2.3.3 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: TAO IDL to C++ compiler
  This package provides an Interface Definition Language (IDL) to C++
  compiler.
@@ -507,7 +507,7 @@ Description: TAO IDL to C++ compiler
 
 Package: tao-ifr
 Architecture: any
-Depends: g++, libtao-2.3.2 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: g++, libtao-2.3.3 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: TAO interface repository
  CORBA-aware programs can contact an interface repository to get
  objects' interfaces at run-time. Then they can use the Dynamic
diff --git a/ACE/debian/libace-6.3.2.docs b/ACE/debian/libace-6.3.3.docs
index 3bdab5b0089..3bdab5b0089 100644
--- a/ACE/debian/libace-6.3.2.docs
+++ b/ACE/debian/libace-6.3.3.docs
diff --git a/ACE/debian/libace-6.3.2.install b/ACE/debian/libace-6.3.3.install
index d9afda38c12..d9afda38c12 100644
--- a/ACE/debian/libace-6.3.2.install
+++ b/ACE/debian/libace-6.3.3.install
diff --git a/ACE/debian/libace-6.3.2.lintian-overrides b/ACE/debian/libace-6.3.3.lintian-overrides
index a734a623241..a734a623241 100644
--- a/ACE/debian/libace-6.3.2.lintian-overrides
+++ b/ACE/debian/libace-6.3.3.lintian-overrides
diff --git a/ACE/debian/libace-flreactor-6.3.2.install b/ACE/debian/libace-flreactor-6.3.3.install
index 528836aacee..528836aacee 100644
--- a/ACE/debian/libace-flreactor-6.3.2.install
+++ b/ACE/debian/libace-flreactor-6.3.3.install
diff --git a/ACE/debian/libace-flreactor-6.3.2.lintian-overrides b/ACE/debian/libace-flreactor-6.3.3.lintian-overrides
index 1b84bf197dc..1b84bf197dc 100644
--- a/ACE/debian/libace-flreactor-6.3.2.lintian-overrides
+++ b/ACE/debian/libace-flreactor-6.3.3.lintian-overrides
diff --git a/ACE/debian/libace-foxreactor-6.3.2.install b/ACE/debian/libace-foxreactor-6.3.3.install
index e360f29f5af..e360f29f5af 100644
--- a/ACE/debian/libace-foxreactor-6.3.2.install
+++ b/ACE/debian/libace-foxreactor-6.3.3.install
diff --git a/ACE/debian/libace-foxreactor-6.3.2.lintian-overrides b/ACE/debian/libace-foxreactor-6.3.3.lintian-overrides
index 7c835b9b8e0..7c835b9b8e0 100644
--- a/ACE/debian/libace-foxreactor-6.3.2.lintian-overrides
+++ b/ACE/debian/libace-foxreactor-6.3.3.lintian-overrides
diff --git a/ACE/debian/libace-htbp-6.3.2.install b/ACE/debian/libace-htbp-6.3.3.install
index 08103fd5cad..08103fd5cad 100644
--- a/ACE/debian/libace-htbp-6.3.2.install
+++ b/ACE/debian/libace-htbp-6.3.3.install
diff --git a/ACE/debian/libace-htbp-6.3.2.lintian-overrides b/ACE/debian/libace-htbp-6.3.3.lintian-overrides
index 63764ad81ee..63764ad81ee 100644
--- a/ACE/debian/libace-htbp-6.3.2.lintian-overrides
+++ b/ACE/debian/libace-htbp-6.3.3.lintian-overrides
diff --git a/ACE/debian/libace-inet-6.3.2.install b/ACE/debian/libace-inet-6.3.3.install
index 59a73a509d0..59a73a509d0 100644
--- a/ACE/debian/libace-inet-6.3.2.install
+++ b/ACE/debian/libace-inet-6.3.3.install
diff --git a/ACE/debian/libace-inet-6.3.2.lintian-overrides b/ACE/debian/libace-inet-6.3.3.lintian-overrides
index a801058e382..a801058e382 100644
--- a/ACE/debian/libace-inet-6.3.2.lintian-overrides
+++ b/ACE/debian/libace-inet-6.3.3.lintian-overrides
diff --git a/ACE/debian/libace-inet-ssl-6.3.2.install b/ACE/debian/libace-inet-ssl-6.3.3.install
index b9b8b9045f7..b9b8b9045f7 100644
--- a/ACE/debian/libace-inet-ssl-6.3.2.install
+++ b/ACE/debian/libace-inet-ssl-6.3.3.install
diff --git a/ACE/debian/libace-inet-ssl-6.3.2.lintian-overrides b/ACE/debian/libace-inet-ssl-6.3.3.lintian-overrides
index c105861e8c8..c105861e8c8 100644
--- a/ACE/debian/libace-inet-ssl-6.3.2.lintian-overrides
+++ b/ACE/debian/libace-inet-ssl-6.3.3.lintian-overrides
diff --git a/ACE/debian/libace-qtreactor-6.3.2.install b/ACE/debian/libace-qtreactor-6.3.3.install
index 1d371e1e571..1d371e1e571 100644
--- a/ACE/debian/libace-qtreactor-6.3.2.install
+++ b/ACE/debian/libace-qtreactor-6.3.3.install
diff --git a/ACE/debian/libace-qtreactor-6.3.2.lintian-overrides b/ACE/debian/libace-qtreactor-6.3.3.lintian-overrides
index 08d9151dbd6..08d9151dbd6 100644
--- a/ACE/debian/libace-qtreactor-6.3.2.lintian-overrides
+++ b/ACE/debian/libace-qtreactor-6.3.3.lintian-overrides
diff --git a/ACE/debian/libace-rmcast-6.3.2.install b/ACE/debian/libace-rmcast-6.3.3.install
index 86e78259853..86e78259853 100644
--- a/ACE/debian/libace-rmcast-6.3.2.install
+++ b/ACE/debian/libace-rmcast-6.3.3.install
diff --git a/ACE/debian/libace-rmcast-6.3.2.lintian-overrides b/ACE/debian/libace-rmcast-6.3.3.lintian-overrides
index 9644f06518a..9644f06518a 100644
--- a/ACE/debian/libace-rmcast-6.3.2.lintian-overrides
+++ b/ACE/debian/libace-rmcast-6.3.3.lintian-overrides
diff --git a/ACE/debian/libace-ssl-6.3.2.NEWS b/ACE/debian/libace-ssl-6.3.3.NEWS
index e5bd0e4aa10..e5bd0e4aa10 100644
--- a/ACE/debian/libace-ssl-6.3.2.NEWS
+++ b/ACE/debian/libace-ssl-6.3.3.NEWS
diff --git a/ACE/debian/libace-ssl-6.3.2.install b/ACE/debian/libace-ssl-6.3.3.install
index 8df45a6d55f..8df45a6d55f 100644
--- a/ACE/debian/libace-ssl-6.3.2.install
+++ b/ACE/debian/libace-ssl-6.3.3.install
diff --git a/ACE/debian/libace-ssl-6.3.2.lintian-overrides b/ACE/debian/libace-ssl-6.3.3.lintian-overrides
index e8ea7ddcf34..e8ea7ddcf34 100644
--- a/ACE/debian/libace-ssl-6.3.2.lintian-overrides
+++ b/ACE/debian/libace-ssl-6.3.3.lintian-overrides
diff --git a/ACE/debian/libace-tkreactor-6.3.2.install b/ACE/debian/libace-tkreactor-6.3.3.install
index 12ab35062d2..12ab35062d2 100644
--- a/ACE/debian/libace-tkreactor-6.3.2.install
+++ b/ACE/debian/libace-tkreactor-6.3.3.install
diff --git a/ACE/debian/libace-tkreactor-6.3.2.lintian-overrides b/ACE/debian/libace-tkreactor-6.3.3.lintian-overrides
index 0be73cb750c..0be73cb750c 100644
--- a/ACE/debian/libace-tkreactor-6.3.2.lintian-overrides
+++ b/ACE/debian/libace-tkreactor-6.3.3.lintian-overrides
diff --git a/ACE/debian/libace-tmcast-6.3.2.install b/ACE/debian/libace-tmcast-6.3.3.install
index e066131dea0..e066131dea0 100644
--- a/ACE/debian/libace-tmcast-6.3.2.install
+++ b/ACE/debian/libace-tmcast-6.3.3.install
diff --git a/ACE/debian/libace-tmcast-6.3.2.lintian-overrides b/ACE/debian/libace-tmcast-6.3.3.lintian-overrides
index 42c1086a791..42c1086a791 100644
--- a/ACE/debian/libace-tmcast-6.3.2.lintian-overrides
+++ b/ACE/debian/libace-tmcast-6.3.3.lintian-overrides
diff --git a/ACE/debian/libace-xml-utils-6.3.2.install b/ACE/debian/libace-xml-utils-6.3.3.install
index 2428ec9f109..2428ec9f109 100644
--- a/ACE/debian/libace-xml-utils-6.3.2.install
+++ b/ACE/debian/libace-xml-utils-6.3.3.install
diff --git a/ACE/debian/libace-xml-utils-6.3.2.lintian-overrides b/ACE/debian/libace-xml-utils-6.3.3.lintian-overrides
index c6d67613a41..c6d67613a41 100644
--- a/ACE/debian/libace-xml-utils-6.3.2.lintian-overrides
+++ b/ACE/debian/libace-xml-utils-6.3.3.lintian-overrides
diff --git a/ACE/debian/libace-xtreactor-6.3.2.install b/ACE/debian/libace-xtreactor-6.3.3.install
index c53614c7208..c53614c7208 100644
--- a/ACE/debian/libace-xtreactor-6.3.2.install
+++ b/ACE/debian/libace-xtreactor-6.3.3.install
diff --git a/ACE/debian/libace-xtreactor-6.3.2.lintian-overrides b/ACE/debian/libace-xtreactor-6.3.3.lintian-overrides
index 3bb1f71096e..3bb1f71096e 100644
--- a/ACE/debian/libace-xtreactor-6.3.2.lintian-overrides
+++ b/ACE/debian/libace-xtreactor-6.3.3.lintian-overrides
diff --git a/ACE/debian/libacexml-6.3.2.docs b/ACE/debian/libacexml-6.3.3.docs
index 002855d7915..002855d7915 100644
--- a/ACE/debian/libacexml-6.3.2.docs
+++ b/ACE/debian/libacexml-6.3.3.docs
diff --git a/ACE/debian/libacexml-6.3.2.install b/ACE/debian/libacexml-6.3.3.install
index d3e912ffa51..d3e912ffa51 100644
--- a/ACE/debian/libacexml-6.3.2.install
+++ b/ACE/debian/libacexml-6.3.3.install
diff --git a/ACE/debian/libacexml-6.3.2.lintian-overrides b/ACE/debian/libacexml-6.3.3.lintian-overrides
index 90f4b3eb86c..90f4b3eb86c 100644
--- a/ACE/debian/libacexml-6.3.2.lintian-overrides
+++ b/ACE/debian/libacexml-6.3.3.lintian-overrides
diff --git a/ACE/debian/libkokyu-6.3.2.docs b/ACE/debian/libkokyu-6.3.3.docs
index e8869c513b2..e8869c513b2 100644
--- a/ACE/debian/libkokyu-6.3.2.docs
+++ b/ACE/debian/libkokyu-6.3.3.docs
diff --git a/ACE/debian/libkokyu-6.3.2.install b/ACE/debian/libkokyu-6.3.3.install
index 62854308f96..62854308f96 100644
--- a/ACE/debian/libkokyu-6.3.2.install
+++ b/ACE/debian/libkokyu-6.3.3.install
diff --git a/ACE/debian/libkokyu-6.3.2.lintian-overrides b/ACE/debian/libkokyu-6.3.3.lintian-overrides
index b01f2e10dfd..b01f2e10dfd 100644
--- a/ACE/debian/libkokyu-6.3.2.lintian-overrides
+++ b/ACE/debian/libkokyu-6.3.3.lintian-overrides
diff --git a/ACE/debian/libtao-2.3.2.docs b/ACE/debian/libtao-2.3.3.docs
index 803353aba72..803353aba72 100644
--- a/ACE/debian/libtao-2.3.2.docs
+++ b/ACE/debian/libtao-2.3.3.docs
diff --git a/ACE/debian/libtao-2.3.2.install b/ACE/debian/libtao-2.3.3.install
index a9643d351fb..a9643d351fb 100644
--- a/ACE/debian/libtao-2.3.2.install
+++ b/ACE/debian/libtao-2.3.3.install
diff --git a/ACE/debian/libtao-2.3.2.lintian-overrides b/ACE/debian/libtao-2.3.3.lintian-overrides
index 77cc51ec2ff..77cc51ec2ff 100644
--- a/ACE/debian/libtao-2.3.2.lintian-overrides
+++ b/ACE/debian/libtao-2.3.3.lintian-overrides
diff --git a/ACE/debian/libtao-flresource-2.3.2.install b/ACE/debian/libtao-flresource-2.3.3.install
index 5d4ee6ce57a..5d4ee6ce57a 100644
--- a/ACE/debian/libtao-flresource-2.3.2.install
+++ b/ACE/debian/libtao-flresource-2.3.3.install
diff --git a/ACE/debian/libtao-flresource-2.3.2.lintian-overrides b/ACE/debian/libtao-flresource-2.3.3.lintian-overrides
index 28b7907f70b..28b7907f70b 100644
--- a/ACE/debian/libtao-flresource-2.3.2.lintian-overrides
+++ b/ACE/debian/libtao-flresource-2.3.3.lintian-overrides
diff --git a/ACE/debian/libtao-foxresource-2.3.2.install b/ACE/debian/libtao-foxresource-2.3.3.install
index 6ceb47601aa..6ceb47601aa 100644
--- a/ACE/debian/libtao-foxresource-2.3.2.install
+++ b/ACE/debian/libtao-foxresource-2.3.3.install
diff --git a/ACE/debian/libtao-foxresource-2.3.2.lintian-overrides b/ACE/debian/libtao-foxresource-2.3.3.lintian-overrides
index 0e291526088..0e291526088 100644
--- a/ACE/debian/libtao-foxresource-2.3.2.lintian-overrides
+++ b/ACE/debian/libtao-foxresource-2.3.3.lintian-overrides
diff --git a/ACE/debian/libtao-orbsvcs-2.3.2.NEWS b/ACE/debian/libtao-orbsvcs-2.3.3.NEWS
index ea0759e0ade..ea0759e0ade 100644
--- a/ACE/debian/libtao-orbsvcs-2.3.2.NEWS
+++ b/ACE/debian/libtao-orbsvcs-2.3.3.NEWS
diff --git a/ACE/debian/libtao-orbsvcs-2.3.2.install b/ACE/debian/libtao-orbsvcs-2.3.3.install
index 270eb6a9174..270eb6a9174 100644
--- a/ACE/debian/libtao-orbsvcs-2.3.2.install
+++ b/ACE/debian/libtao-orbsvcs-2.3.3.install
diff --git a/ACE/debian/libtao-orbsvcs-2.3.2.lintian-overrides b/ACE/debian/libtao-orbsvcs-2.3.3.lintian-overrides
index 8f357d027bf..8f357d027bf 100644
--- a/ACE/debian/libtao-orbsvcs-2.3.2.lintian-overrides
+++ b/ACE/debian/libtao-orbsvcs-2.3.3.lintian-overrides
diff --git a/ACE/debian/libtao-qtresource-2.3.2.install b/ACE/debian/libtao-qtresource-2.3.3.install
index 172f4c45db8..172f4c45db8 100644
--- a/ACE/debian/libtao-qtresource-2.3.2.install
+++ b/ACE/debian/libtao-qtresource-2.3.3.install
diff --git a/ACE/debian/libtao-qtresource-2.3.2.lintian-overrides b/ACE/debian/libtao-qtresource-2.3.3.lintian-overrides
index d7c2f9dac9f..d7c2f9dac9f 100644
--- a/ACE/debian/libtao-qtresource-2.3.2.lintian-overrides
+++ b/ACE/debian/libtao-qtresource-2.3.3.lintian-overrides
diff --git a/ACE/debian/libtao-tkresource-2.3.2.install b/ACE/debian/libtao-tkresource-2.3.3.install
index 7f543154b5b..7f543154b5b 100644
--- a/ACE/debian/libtao-tkresource-2.3.2.install
+++ b/ACE/debian/libtao-tkresource-2.3.3.install
diff --git a/ACE/debian/libtao-tkresource-2.3.2.lintian-overrides b/ACE/debian/libtao-tkresource-2.3.3.lintian-overrides
index 94627217c4e..94627217c4e 100644
--- a/ACE/debian/libtao-tkresource-2.3.2.lintian-overrides
+++ b/ACE/debian/libtao-tkresource-2.3.3.lintian-overrides
diff --git a/ACE/debian/libtao-xtresource-2.3.2.install b/ACE/debian/libtao-xtresource-2.3.3.install
index ab5151ed073..ab5151ed073 100644
--- a/ACE/debian/libtao-xtresource-2.3.2.install
+++ b/ACE/debian/libtao-xtresource-2.3.3.install
diff --git a/ACE/debian/libtao-xtresource-2.3.2.lintian-overrides b/ACE/debian/libtao-xtresource-2.3.3.lintian-overrides
index 3b0d1808c3c..3b0d1808c3c 100644
--- a/ACE/debian/libtao-xtresource-2.3.2.lintian-overrides
+++ b/ACE/debian/libtao-xtresource-2.3.3.lintian-overrides
diff --git a/ACE/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec
index e7ad94242c9..1b6b25f55b5 100644
--- a/ACE/rpmbuild/ace-tao.spec
+++ b/ACE/rpmbuild/ace-tao.spec
@@ -1,7 +1,7 @@
 # Set the version number here.
-%define ACEVER  6.3.2
-%define TAOVER  2.3.2
-%define CIAOVER 1.3.2
+%define ACEVER  6.3.3
+%define TAOVER  2.3.3
+%define CIAOVER 1.3.3
 
 # Conditional build
 # Default values are
diff --git a/CIAO/ChangeLogs/CIAO-1_3_3 b/CIAO/ChangeLogs/CIAO-1_3_3
new file mode 100644
index 00000000000..87efafb110e
--- /dev/null
+++ b/CIAO/ChangeLogs/CIAO-1_3_3
@@ -0,0 +1,56 @@
+commit 006534e2c5070472f5ae630018a904191dbf42a1
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Sep 15 18:26:19 2015 +0200
+
+    Use separate instead of seperate
+        * ACE/ace/Functor_String.h:
+        * ACE/ace/WFMO_Reactor.h:
+        * ACE/tests/Env_Value_Test.cpp:
+        * ACE/tests/Proactor_Scatter_Gather_Test.cpp:
+        * ACE/tests/Service_Config_DLL.h:
+        * CIAO/docs/TODO.html:
+        * DAnCE/dance/DAnCE_LocalityManager.idl:
+        * TAO/TAO-INSTALL.html:
+        * TAO/docs/releasenotes/index.html:
+        * TAO/examples/AMH/Sink_Server/Base_Server.h:
+        * TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h:
+        * TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.h:
+        * TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp:
+        * TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.h:
+        * TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp:
+        * TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h:
+        * TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp:
+        * TAO/tao/Asynch_Reply_Dispatcher_Base.cpp:
+        * TAO/tao/GIOP_Message_Base.cpp:
+        * TAO/tao/ORB_Core.cpp:
+        * TAO/tao/Remote_Invocation.cpp:
+        * TAO/tao/Transport_Connector.cpp:
+        * TAO/tao/params.cpp:
+        * TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.h:
+
+commit 1497ecf2c616fcf1e8ddd1182bdd139daade656f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Jul 8 09:33:37 2015 +0200
+
+    Removed verbatim section, that is already done in the ndds base projects
+        * CIAO/MPC/config/ndds_idltocpp_ts_defaults.mpb:
+
+commit 68bb2cb2d2bd3d3df268ab86eb4feb51cf874ef2
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jul 7 17:08:28 2015 +0200
+
+    Added mention of NDDSSCRIPTDIR
+        * CIAO/NEWS:
+
+commit 049c2cbbb808ca8a8ae30e3a33321397fe69bd74
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu May 7 10:33:17 2015 +0200
+
+    Make x.3.2 public and prepare for next release
+        * ACE/NEWS:
+        * ACE/bin/diff-builds-and-group-fixed-tests-only.sh:
+        * ACE/docs/Download.html:
+        * ACE/docs/bczar/bczar.html:
+        * CIAO/NEWS:
+        * DAnCE/NEWS:
+        * TAO/NEWS:
diff --git a/CIAO/PROBLEM-REPORT-FORM b/CIAO/PROBLEM-REPORT-FORM
index f7c3073089e..b898604c2ed 100644
--- a/CIAO/PROBLEM-REPORT-FORM
+++ b/CIAO/PROBLEM-REPORT-FORM
@@ -41,9 +41,9 @@
 To: ciao-users@list.isis.vanderbilt.edu
 Subject: [area]: [synopsis]
 
-    CIAO VERSION: 1.3.2
-    TAO VERSION : 2.3.2
-    ACE VERSION : 6.3.2
+    CIAO VERSION: 1.3.3
+    TAO VERSION : 2.3.3
+    ACE VERSION : 6.3.3
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/CIAO/VERSION b/CIAO/VERSION
index 43662333fcb..92e619ce04c 100644
--- a/CIAO/VERSION
+++ b/CIAO/VERSION
@@ -1,4 +1,4 @@
-This is CIAO version 1.3.2, released Thu May 07 10:14:44 CEST 2015
+This is CIAO version 1.3.3, released Thu Sep 17 08:51:30 CEST 2015
 
 If you have any problems with or questions about CIAO, please send
 e-mail to the CIAO mailing list (ciao-users@list.isis.vanderbilt.edu),
diff --git a/CIAO/ciao/Version.h b/CIAO/ciao/Version.h
index fd4437e63d3..ce552564ae9 100644
--- a/CIAO/ciao/Version.h
+++ b/CIAO/ciao/Version.h
@@ -4,5 +4,5 @@
 
 #define CIAO_MAJOR_VERSION 1
 #define CIAO_MINOR_VERSION 3
-#define CIAO_BETA_VERSION 2
-#define CIAO_VERSION "1.3.2"
+#define CIAO_BETA_VERSION 3
+#define CIAO_VERSION "1.3.3"
diff --git a/DAnCE/ChangeLogs/DAnCE-1_3_3 b/DAnCE/ChangeLogs/DAnCE-1_3_3
new file mode 100644
index 00000000000..4810cb2296b
--- /dev/null
+++ b/DAnCE/ChangeLogs/DAnCE-1_3_3
@@ -0,0 +1,42 @@
+commit 006534e2c5070472f5ae630018a904191dbf42a1
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Sep 15 18:26:19 2015 +0200
+
+    Use separate instead of seperate
+        * ACE/ace/Functor_String.h:
+        * ACE/ace/WFMO_Reactor.h:
+        * ACE/tests/Env_Value_Test.cpp:
+        * ACE/tests/Proactor_Scatter_Gather_Test.cpp:
+        * ACE/tests/Service_Config_DLL.h:
+        * CIAO/docs/TODO.html:
+        * DAnCE/dance/DAnCE_LocalityManager.idl:
+        * TAO/TAO-INSTALL.html:
+        * TAO/docs/releasenotes/index.html:
+        * TAO/examples/AMH/Sink_Server/Base_Server.h:
+        * TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h:
+        * TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.h:
+        * TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp:
+        * TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.h:
+        * TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp:
+        * TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h:
+        * TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp:
+        * TAO/tao/Asynch_Reply_Dispatcher_Base.cpp:
+        * TAO/tao/GIOP_Message_Base.cpp:
+        * TAO/tao/ORB_Core.cpp:
+        * TAO/tao/Remote_Invocation.cpp:
+        * TAO/tao/Transport_Connector.cpp:
+        * TAO/tao/params.cpp:
+        * TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.h:
+
+commit 049c2cbbb808ca8a8ae30e3a33321397fe69bd74
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu May 7 10:33:17 2015 +0200
+
+    Make x.3.2 public and prepare for next release
+        * ACE/NEWS:
+        * ACE/bin/diff-builds-and-group-fixed-tests-only.sh:
+        * ACE/docs/Download.html:
+        * ACE/docs/bczar/bczar.html:
+        * CIAO/NEWS:
+        * DAnCE/NEWS:
+        * TAO/NEWS:
diff --git a/DAnCE/PROBLEM-REPORT-FORM b/DAnCE/PROBLEM-REPORT-FORM
index 0dccc24e608..694d05bf69c 100644
--- a/DAnCE/PROBLEM-REPORT-FORM
+++ b/DAnCE/PROBLEM-REPORT-FORM
@@ -41,9 +41,9 @@
 To: ciao-users@list.isis.vanderbilt.edu
 Subject: [area]: [synopsis]
 
-    DAnCE VERSION: 1.3.2
-    TAO VERSION : 2.3.2
-    ACE VERSION : 6.3.2
+    DAnCE VERSION: 1.3.3
+    TAO VERSION : 2.3.3
+    ACE VERSION : 6.3.3
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/DAnCE/VERSION b/DAnCE/VERSION
index 9f7c79af79d..3a777473e63 100644
--- a/DAnCE/VERSION
+++ b/DAnCE/VERSION
@@ -1,4 +1,4 @@
-This is DAnCE version 1.3.2, released Thu May 07 10:14:44 CEST 2015
+This is DAnCE version 1.3.3, released Thu Sep 17 08:51:30 CEST 2015
 
 If you have any problems with or questions about DAnCE, please send
 e-mail to the CIAO mailing list (ciao-users@list.isis.vanderbilt.edu),
diff --git a/DAnCE/dance/Version.h b/DAnCE/dance/Version.h
index d9892d7e665..bdf9e70e60e 100644
--- a/DAnCE/dance/Version.h
+++ b/DAnCE/dance/Version.h
@@ -4,5 +4,5 @@
 
 #define DAnCE_MAJOR_VERSION 1
 #define DAnCE_MINOR_VERSION 3
-#define DAnCE_BETA_VERSION 2
-#define DAnCE_VERSION "1.3.2"
+#define DAnCE_BETA_VERSION 3
+#define DAnCE_VERSION "1.3.3"
diff --git a/TAO/ChangeLogs/TAO-2_3_3 b/TAO/ChangeLogs/TAO-2_3_3
new file mode 100644
index 00000000000..633e347dc23
--- /dev/null
+++ b/TAO/ChangeLogs/TAO-2_3_3
@@ -0,0 +1,635 @@
+commit bb08a81357f6b7e87aafb1807d114b945552c11b
+Author: Phil Mesnier <mesnierp@ociweb.com>
+Date:   Wed Sep 16 16:25:36 2015 -0500
+
+    update NEWS, putting TAO notes in the correct file
+
+commit 784e8c92244dc081bef3d7ac6ba5ddc0d720474b
+Merge: 006534e 5100781
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Sep 15 18:26:56 2015 +0200
+
+    Merge branch 'master' of git://github.com/DOCGroup/ATCD
+
+commit 006534e2c5070472f5ae630018a904191dbf42a1
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Sep 15 18:26:19 2015 +0200
+
+    Use separate instead of seperate
+        * ACE/ace/Functor_String.h:
+        * ACE/ace/WFMO_Reactor.h:
+        * ACE/tests/Env_Value_Test.cpp:
+        * ACE/tests/Proactor_Scatter_Gather_Test.cpp:
+        * ACE/tests/Service_Config_DLL.h:
+        * CIAO/docs/TODO.html:
+        * DAnCE/dance/DAnCE_LocalityManager.idl:
+        * TAO/TAO-INSTALL.html:
+        * TAO/docs/releasenotes/index.html:
+        * TAO/examples/AMH/Sink_Server/Base_Server.h:
+        * TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h:
+        * TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.h:
+        * TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp:
+        * TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.h:
+        * TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp:
+        * TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h:
+        * TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp:
+        * TAO/tao/Asynch_Reply_Dispatcher_Base.cpp:
+        * TAO/tao/GIOP_Message_Base.cpp:
+        * TAO/tao/ORB_Core.cpp:
+        * TAO/tao/Remote_Invocation.cpp:
+        * TAO/tao/Transport_Connector.cpp:
+        * TAO/tao/params.cpp:
+        * TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.h:
+
+commit 82968ffb2f5cfb9c94f54d5f1f1418c0510830c0
+Merge: 3e600c2 7384879
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Fri Sep 11 16:27:23 2015 -0500
+
+    Merge pull request #140 from mitza-oci/master
+    
+    ImR changes for uses_wchar=1
+
+commit 7384879f35a47c0a274cfe2d2434a2e74993dfbb
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Fri Sep 11 15:25:21 2015 -0500
+
+    ImR changes for uses_wchar=1
+
+commit 204173216165220b541fede9f04190466040618e
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Fri Sep 11 15:23:54 2015 -0500
+
+    Updated prior ImR change for compatibility with SunCC's "standard" library.
+
+commit 469dbb215ee76dce382038a179847f4ecb6c65a5
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Sep 11 21:03:29 2015 +0200
+
+    Updated old email addresses
+        * ACE/ace/config-kfreebsd.h:
+        * ACE/docs/ACE-guidelines.html:
+        * ACE/docs/ACE-subsets.html:
+        * TAO/docs/implrepo/paper.html:
+        * TAO/docs/minimumTAO.html:
+
+commit 821e278fc22951934becf3fa2f90d4942c669f17
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Sep 11 21:03:19 2015 +0200
+
+    Updated platform list
+        * TAO/TAO-INSTALL.html:
+
+commit 4538c1b541cb9831b189ff259f8e266f1d1738d0
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Sep 10 13:35:12 2015 +0200
+
+    bug 2908 regression now runs so include it in our default test suite
+        * TAO/bin/tao_other_tests.lst:
+
+commit af99f78ea32f83e3afc2bf390936dcdf5edc55cb
+Merge: 0a76e44 133850b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Sep 10 09:20:50 2015 +0200
+
+    Merge branch 'master' of git://github.com/DOCGroup/ATCD
+
+commit 0a76e4463b396ec068be691b2254e0e209473b0d
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Sep 10 09:14:35 2015 +0200
+
+    Document SL2 extension
+        * TAO/NEWS:
+
+commit 60a5c5332af44d77d371289529839e8bbbc3a4af
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Sep 9 16:58:59 2015 +0200
+
+    More comments
+        * TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp:
+        * TAO/orbsvcs/orbsvcs/SecurityLevel2.idl:
+
+commit ed1cc7358b47a35146b9b8ba2b640288dfa652f4
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Sep 9 16:51:47 2015 +0200
+
+    Simplify changes
+        * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp:
+        * TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp:
+
+commit dd02063104bb2412e1f278c2e276ec8e1faec480
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Sep 9 16:16:28 2015 +0200
+
+    Extended the SL2 Security Manager to have a separate flag for the default for collocated calls. This is now used by SSLIOP to do check whether the call is allowed to go through or not. It is very likely that a user does want to allow non-secure collocated calls but does want to block non-secure remote calls. He has now the flexibility to do so. Bugzilla 2908 now runs by setting the collocated flag
+        * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp:
+        * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h:
+        * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp:
+        * TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp:
+        * TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.h:
+        * TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h:
+        * TAO/orbsvcs/orbsvcs/SecurityLevel2.idl:
+        * TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp:
+        * TAO/tao/PI_Server/ServerRequestInfo.h:
+
+commit 7f921a893520c4b94e774375afe33806409221b5
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Wed Sep 9 09:02:49 2015 -0500
+
+    TAO ImplRepo: fixed a few remaining wchar issues
+
+commit aacf0068c2ec6949756e8a3faf2787ed12e622f9
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Sep 9 14:09:23 2015 +0200
+
+    Const fix
+        * TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp:
+
+commit 8bda962113de9163a935e97008d4199eeced83f3
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Sep 9 14:09:03 2015 +0200
+
+    Layout changes
+        * TAO/orbsvcs/orbsvcs/SecurityLevel2.idl:
+
+commit ca6f0f3e612b842f7c105efa0ace1ec3aedc7c17
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Sep 9 13:56:35 2015 +0200
+
+    Layout changes
+        * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp:
+        * TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.h:
+
+commit d2b7e872d182e052da5e3adbf4650a4624358734
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Sep 9 13:55:52 2015 +0200
+
+    Unicode fix
+        * TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp:
+
+commit de0aac404402347cc4eed44fc672658a11c3bb89
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Sep 9 12:56:08 2015 +0200
+
+    Added functionality for the client to shutdown the server
+        * TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger.idl:
+        * TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerClient.cpp:
+        * TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger_i.cpp:
+        * TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger_i.h:
+
+commit dc973e3a494597670d5ca79eb9dff6fa9d8c0b9b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Sep 9 12:34:33 2015 +0200
+
+    Simplify code
+        * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp:
+
+commit e8e4e34da15ce12376d4f12c63e4228458835cb0
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Sep 9 12:33:42 2015 +0200
+
+    Removed block of commented out code
+        * TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp:
+
+commit f938c43aaf808d8f2dc96666b131af7ed778157f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Sep 9 12:29:23 2015 +0200
+
+    Added additional log line
+        * TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerClient.cpp:
+
+commit 68e826407a51d241847557f2ebd7f167d9047b54
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Sep 9 12:29:13 2015 +0200
+
+    Also destroy the POA at shutdown
+        * TAO/orbsvcs/tests/Security/Bug_2908_Regression/MessengerServer.cpp:
+
+commit 59f70f68950aa0eb99b3c5a6b52551e751749250
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Tue Sep 8 16:34:27 2015 -0500
+
+    TAO ImplRepo: build with uses_wchar=1
+
+commit 1fdd544a984a58d4860f3a2f8c7aa7d29a188bb9
+Author: Phil Mesnier <mesnierp@ociweb.com>
+Date:   Mon Aug 31 10:51:24 2015 -0500
+
+    Fix coverity raised concern.
+
+commit 6f4cf37d8cf5117467b4d64010a4ff87ba3952a9
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Aug 27 19:02:09 2015 +0200
+
+    Zap empty lines
+        * TAO/tests/POA/On_Demand_Activation/README:
+
+commit 96dac2b18934edae0aa15d6a003cbcf3aea06f3e
+Author: Phil Mesnier <mesnierp@ociweb.com>
+Date:   Wed Aug 26 11:21:50 2015 -0500
+
+    Make the Select MT/ST reactor initialization consistent with the TP reactor setting the max files value
+
+commit 38d2953ca537b6b910864ee707940a390664b7f9
+Author: Phil Mesnier <mesnierp@ociweb.com>
+Date:   Wed Aug 26 11:19:18 2015 -0500
+
+    Fix to avoid adding ::1 as an extra endpoint to defaulted address lists when non-local IPv4 addresses are available.
+
+commit 02b0d27297ca3efc46fc53f54391f0ebd2b27dca
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Thu Aug 13 14:29:14 2015 -0500
+
+    AVSteams: Workaround for vc14 known issue
+
+commit fecaccad1d5a0cacdf731a71ce7b24789f0a12ae
+Author: Phil Mesnier <mesnier_p@ociweb.com>
+Date:   Wed Aug 12 14:51:38 2015 -0500
+
+    Test added to stress the ImR in as MT features are enabled.
+
+commit b0423e2cc4592ff5fce0d7c4541192ff4a0c9cb4
+Author: Phil Mesnier <mesnier_p@ociweb.com>
+Date:   Wed Aug 12 14:49:49 2015 -0500
+
+    Added a new cl option -q for quiet operation to improve its scripting ability.
+
+commit abe659c254f8e06dc32bb259097490b6175e2767
+Author: Phil Mesnier <mesnier_p@ociweb.com>
+Date:   Wed Aug 12 14:47:26 2015 -0500
+
+    Prevent the passive peer of a FT pair from echoing a persistent file update, possibly overwriting a later update.
+
+commit 49988227fcafe89aa6c3e709d5b6c606d1a3a382
+Author: Phil Mesnier <mesnier_p@ociweb.com>
+Date:   Wed Aug 12 14:44:45 2015 -0500
+
+    General debug log improvements.
+
+commit 8d70a5080aa550f9136434c351c873d4ca7a1cf8
+Author: Phil Mesnier <mesnier_p@ociweb.com>
+Date:   Wed Aug 12 14:41:56 2015 -0500
+
+    Separate out the FT peer synchronization to a separate ORB run in
+    its own thread. This avoids an update backlog that may lead to a
+    deadlock in exstream situations. Replicator is the new class. New
+    cl options --FtEndpoint and --FtUpdateDelay provide configuration
+    to the replicator instance.
+
+commit 7dff918d854b9cfea1860c149efa80de4b9124b0
+Merge: f997d2e 984413e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Aug 11 09:24:28 2015 +0200
+
+    Merge pull request #126 from dpward/master
+    
+    Honor '-Cw' flag passed to tao_idl
+
+commit 984413efa99c12a3462680cdf6351bb590caa6d3
+Author: David Ward <david.ward@ll.mit.edu>
+Date:   Thu Jun 25 17:12:18 2015 -0400
+
+    Honor '-Cw' flag passed to tao_idl
+    
+    tao_idl was not able to compile IDL files which had an identifier
+    that differed only in case from an IDL keyword, even if the '-Cw'
+    flag was used.
+    
+    Signed-off-by: David Ward <david.ward@ll.mit.edu>
+
+commit 173757d6e24f4a31c3a65a957b891c4df5a3f177
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Mon Aug 10 12:45:41 2015 -0500
+
+    Allow spaces in the temp dir used for tao_idl's invocation of the preprocessor.
+
+commit f75c149b7a54b5fe1e3a6a7bf2b4ba96f135c547
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Fri Jul 24 08:26:44 2015 -0500
+
+    TAO_IDL: silence a warning from some older versions of GCC
+
+commit b3a628795fe7da876e5fd42a5f15788038f7e9c9
+Merge: ee3abcc 21d1c42
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Thu Jul 23 10:40:59 2015 -0500
+
+    Merge remote-tracking branch 'upstream/master' into tao-idl-switch-warnings
+
+commit ee3abcc9270a2f30309d3fd925621528d453bbe6
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Thu Jul 23 10:31:06 2015 -0500
+
+    TAO_IDL: fixed regression test 3821 failure, cleaned up warnings.
+
+commit 7e1493ffc1bfd2ec200a620827ae00bf899cc11b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Jul 23 08:28:22 2015 +0200
+
+    Updated comment
+        * TAO/tao/Compression/Compressor_Factory.h:
+        * TAO/tao/DynamicInterface/DII_Reply_Handler.h:
+        * TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h:
+
+commit ca284c2597f205e1c71044f62fe85ca517f2ed88
+Merge: c4a0a7c cbb0e28
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Wed Jul 22 13:19:36 2015 -0500
+
+    Merge pull request #118 from mitza-oci/tao-idl-switch-warnings
+    
+    TAO_IDL: generate "if" instead of "switch" for bool-discriminated unions.
+
+commit cbb0e28afb2bbd09d668c42d8b280aad4d69b582
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Wed Jul 22 09:30:02 2015 -0500
+
+    TAO_IDL: generate "if" instead of "switch" for bool-discriminated unions.
+    
+    Eliminates warnings in generated code with newer clang and gcc.
+
+commit 710a4fb630d92f42cfb1286106c4f90d818965ae
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Jul 22 16:29:44 2015 +0200
+
+    Add workarounds for msvc14 connect bug 801202
+        * TAO/tao/Compression/Compressor_Factory.h:
+        * TAO/tao/DynamicInterface/DII_Reply_Handler.h:
+        * TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h:
+
+commit 34499bb7c5e0c1be2ede98b8e32266ddaf5e3ead
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Jul 22 14:34:48 2015 +0200
+
+    Use ACE_UNIMPLEMENTED_FUNC so that with C++11 the operators are marked with =delete
+        * TAO/tao/DynamicInterface/DII_Reply_Handler.h:
+        * TAO/tao/LocalObject.h:
+        * TAO/tao/Object.h:
+
+commit 501301d2ccb74552aa87f09050643a520cb00855
+Author: Phil Mesnier <mesnier_p@ociweb.com>
+Date:   Mon Jul 20 15:43:15 2015 -0500
+
+    Fix a logic error.
+
+commit ba7d2cc24f4a113c2025f8600c45d9572f1ad8f6
+Author: Phil Mesnier <mesnier_p@ociweb.com>
+Date:   Sat Jul 18 07:56:41 2015 -0500
+
+    remove superfluous code segment that fails to compile on some platforms
+
+commit 3bafdc5f7fbb39720c2c1d8a492e9dbd2f5217c8
+Author: Phil Mesnier <mesnier_p@ociweb.com>
+Date:   Fri Jul 17 08:54:33 2015 -0500
+
+    PICurrent / ImR, fix build farm exposed issues
+
+commit dff936ede216e5eb8aa490bea37edb0ffbdacf67
+Author: Phil Mesnier <mesnier_p@ociweb.com>
+Date:   Thu Jul 16 14:13:17 2015 -0500
+
+    Fuzz fix
+
+commit ae45f27cba5fd007e6e079257aaa9cc4d40af146
+Author: Phil Mesnier <mesnier_p@ociweb.com>
+Date:   Thu Jul 16 11:14:24 2015 -0500
+
+    regression test for PI current slot state preservation
+
+commit 2cd30eee84ad81b1c3ecb61707b91c735622d652
+Author: Phil Mesnier <mesnier_p@ociweb.com>
+Date:   Mon Jul 6 17:43:50 2015 -0500
+
+    Removed accidental patch artifact addition
+
+commit 33bcfff73df7a0ec8005c1b4649dd2bc49e8566c
+Author: Phil Mesnier <mesnier_p@ociweb.com>
+Date:   Mon Jul 6 17:41:29 2015 -0500
+
+    Correct a Veracode identified potential risk.
+
+commit 01bd56a1749daeb14cebcda217474b364b120f22
+Author: Phil Mesnier <mesnier_p@ociweb.com>
+Date:   Fri Jun 19 11:28:20 2015 -0500
+
+    Ensure the PICurrent stack is reset in the case of a retry due to
+    a retry on a TRANSIENT. This is now consistent with other retries.
+
+commit 521090d1937300aa22df95805ad641b08b79e6d2
+Author: Phil Mesnier <mesnier_p@ociweb.com>
+Date:   Tue Jun 9 11:09:32 2015 -0500
+
+    Thread pool bugfixes
+    relax limits on fixed POA pool size.
+    Ensure the dynamic thread activation succeeded before entering wait
+
+commit 9acd83fb4fbdf677f4ab402da4dd2e875ec4d14e
+Author: Phil Mesnier <mesnier_p@ociweb.com>
+Date:   Thu Jun 4 14:21:21 2015 -0500
+
+    Correcting a typo I made two years ago.
+
+commit c0f166c8ef8638e9331b706e8ccf5c679a013f7e
+Author: Phil Mesnier <mesnier_p@ociweb.com>
+Date:   Thu Jun 4 14:19:31 2015 -0500
+
+    Applying Cesar Mello's fix for wchar IFR build
+
+commit d19f0a4740e37517207c4d204639b9ccdff00f4e
+Author: Martin Corino <mcorino@remedy.nl>
+Date:   Wed Jun 3 10:17:20 2015 +0200
+
+    Fix integer signedness comparison warning.
+    
+        * TAO/tao/Dynamic_TP/DTP_Task.cpp:
+
+commit 404853f41d696d1b0cd421a594d1f69825c95f1f
+Author: Martin Corino <mcorino@remedy.nl>
+Date:   Tue Jun 2 13:58:59 2015 +0200
+
+    Fix MSVC integer conversion warnings.
+    
+        * TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp:
+
+commit 0b5d570a53372274fd306e0d23506a3ac9e007e8
+Author: Martin Corino <mcorino@remedy.nl>
+Date:   Tue Jun 2 11:16:30 2015 +0200
+
+    Fix MSVC integer conversion warnings.
+    
+        * TAO/TAO_IDL/fe/idl.ll:
+        * TAO/TAO_IDL/fe/idl.yy.cpp:
+
+commit cfb1dc00fd905b7bccff6a15f6352d7f613e3867
+Author: Martin Corino <mcorino@remedy.nl>
+Date:   Mon Jun 1 12:20:08 2015 +0200
+
+    Fix MSVC integer conversion warnings.
+    
+        * TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp:
+
+commit 2d32faafe14a59e1f23e77afdcb860d9aa6546e7
+Author: Martin Corino <mcorino@remedy.nl>
+Date:   Mon Jun 1 12:08:05 2015 +0200
+
+    Fix MSVC integer conversion warning.
+    
+        * TAO/tao/Monitor/Monitor_Impl.cpp:
+
+commit 3bd319a01dcfa241855b6b736bd12056565b52d7
+Author: Martin Corino <mcorino@remedy.nl>
+Date:   Mon Jun 1 12:01:55 2015 +0200
+
+    Fix MSVC integer conversion warning.
+    
+        * TAO/tao/TransportCurrent/Current_Impl.cpp:
+
+commit 3217bb88f53bca2644aed79a0589a82352fa2982
+Author: Martin Corino <mcorino@remedy.nl>
+Date:   Mon Jun 1 11:59:42 2015 +0200
+
+    Fix MSVC integer conversion warnings.
+    
+        * TAO/tao/Strategies/DIOP_Profile.cpp:
+        * TAO/tao/Strategies/DIOP_Transport.cpp:
+        * TAO/tao/Strategies/SHMIOP_Profile.cpp:
+
+commit 1c9e65f71f07c3438ae98ddba6b4563578bf25a0
+Author: Martin Corino <mcorino@remedy.nl>
+Date:   Mon Jun 1 11:55:05 2015 +0200
+
+    Fix MSVC integer connversion warning.
+    
+        * TAO/tao/RTCORBA/Thread_Pool.cpp:
+
+commit 5b1613d351b8958cff8fff5de9322bf8dff64fcb
+Author: Martin Corino <mcorino@remedy.nl>
+Date:   Mon Jun 1 11:53:52 2015 +0200
+
+    Fix MSVC integer conversion warning.
+    
+        * TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp:
+
+commit f2f183b53d7c683f8fe420c236e305b3d1febe7f
+Author: Martin Corino <mcorino@remedy.nl>
+Date:   Mon Jun 1 11:50:53 2015 +0200
+
+    Fix MSVC integer conversion warnings.
+    
+        * TAO/tao/Dynamic_TP/DTP_Task.cpp:
+        * TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp:
+
+commit 242514556a78edf036bc2b791ef4c8ad8675237b
+Author: Martin Corino <mcorino@remedy.nl>
+Date:   Mon Jun 1 11:35:13 2015 +0200
+
+    Fix MSVC integer conversion warnings.
+    
+        * TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp:
+        * TAO/tao/DynamicInterface/Request.cpp:
+
+commit 7bc30b68770f26eb53e194c54f1e1e92ccd8fe43
+Author: Martin Corino <mcorino@remedy.nl>
+Date:   Mon Jun 1 11:29:42 2015 +0200
+
+    Fix MSVC integer conversion warnings.
+    
+        * TAO/tao/DynamicAny/DynValue_i.cpp:
+
+commit 98a76c8a801f3c9d35ebedca4de7bb18effdc888
+Author: Martin Corino <mcorino@remedy.nl>
+Date:   Mon Jun 1 11:22:37 2015 +0200
+
+    Fix MSVC integer conversion warnings.
+    
+        * TAO/tao/Valuetype/ValueBase.cpp:
+
+commit d6b3c39af65a94712d7860c5301ccd49f540b814
+Author: Martin Corino <mcorino@remedy.nl>
+Date:   Mon Jun 1 11:17:42 2015 +0200
+
+    Fix MSVC integer conversion warnings.
+    
+        * TAO/tao/PortableServer/POAManager.inl:
+        * TAO/tao/PortableServer/Servant_Base.cpp:
+
+commit 66bc5ea15a06468eced9efc553ae570b584c1a9f
+Author: Martin Corino <mcorino@remedy.nl>
+Date:   Mon Jun 1 10:08:52 2015 +0200
+
+    Fix compile problems with integer conversions.
+    
+        * TAO/tao/CORBA_String.cpp:
+
+commit ba64a124f699c1e6d2125c619480c8a40c4683aa
+Author: Martin Corino <mcorino@remedy.nl>
+Date:   Mon Jun 1 09:30:38 2015 +0200
+
+    Fixing MSVC integer conversion warnings.
+    
+        * TAO/tao/AnyTypeCode/Alias_TypeCode.cpp:
+        * TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp:
+        * TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp:
+        * TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp:
+        * TAO/tao/AnyTypeCode/Struct_TypeCode.cpp:
+        * TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp:
+        * TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl:
+        * TAO/tao/AnyTypeCode/Union_TypeCode.cpp:
+        * TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp:
+        * TAO/tao/AnyTypeCode/Value_TypeCode.cpp:
+        * TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp:
+
+commit e23c3772c686b0b4af2eb0b7af622c7075b4b4df
+Author: Martin Corino <mcorino@remedy.nl>
+Date:   Mon Jun 1 09:07:30 2015 +0200
+
+    Fixing MSVC integer conversion warnings.
+    
+        * TAO/tao/CDR.cpp:
+        * TAO/tao/CORBALOC_Parser.cpp:
+        * TAO/tao/CORBA_String.cpp:
+        * TAO/tao/HTTP_Client.cpp:
+        * TAO/tao/IIOP_Profile.cpp:
+        * TAO/tao/Invocation_Adapter.cpp:
+        * TAO/tao/MCAST_Parser.cpp:
+        * TAO/tao/On_Demand_Fragmentation_Strategy.cpp:
+        * TAO/tao/Storable_FlatFileStream.cpp:
+        * TAO/tao/Transport.cpp:
+
+commit f2e0d66eb15f56231e44bd44c57b12e3d0b70765
+Author: Martin Corino <mcorino@remedy.nl>
+Date:   Sun May 31 15:10:18 2015 +0200
+
+    Fix MSVC14 integer conversion warnings.
+    
+        * TAO/TAO_IDL/ast/ast_structure.cpp:
+        * TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_operation/operation.cpp:
+        * TAO/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp:
+        * TAO/TAO_IDL/driver/drv_preproc.cpp:
+
+commit 749d397ff387941c2a5e5dc9692619300ad64f88
+Author: Phil Mesnier <mesnier_p@ociweb.com>
+Date:   Sun May 17 16:03:55 2015 -0500
+
+    Coverity fix
+
+commit 15980669c54c3b1eb2651dd3b24a64d1a4c77e48
+Author: Phil Mesnier <mesnier_p@ociweb.com>
+Date:   Tue May 12 18:01:28 2015 -0500
+
+    Improve processing of old TAO logs.
+    fix output errors, fix parsing heavily threaded, RW strategy based logs.
+
+commit 049c2cbbb808ca8a8ae30e3a33321397fe69bd74
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu May 7 10:33:17 2015 +0200
+
+    Make x.3.2 public and prepare for next release
+        * ACE/NEWS:
+        * ACE/bin/diff-builds-and-group-fixed-tests-only.sh:
+        * ACE/docs/Download.html:
+        * ACE/docs/bczar/bczar.html:
+        * CIAO/NEWS:
+        * DAnCE/NEWS:
+        * TAO/NEWS:
diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM
index e7affd85996..0ae06d82ef8 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.3.2
-    ACE VERSION: 6.3.2
+    TAO VERSION: 2.3.3
+    ACE VERSION: 6.3.3
 
     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 432df077bd8..170b7e192e5 100644
--- a/TAO/VERSION
+++ b/TAO/VERSION
@@ -1,4 +1,4 @@
-This is TAO version 2.3.2, released Thu May 07 10:14:44 CEST 2015
+This is TAO version 2.3.3, released Thu Sep 17 08:51:30 CEST 2015
 
 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 3c8f7ae84ba..2c55baaa4ec 100644
--- a/TAO/tao/Version.h
+++ b/TAO/tao/Version.h
@@ -4,5 +4,5 @@
 
 #define TAO_MAJOR_VERSION 2
 #define TAO_MINOR_VERSION 3
-#define TAO_BETA_VERSION 2
-#define TAO_VERSION "2.3.2"
+#define TAO_BETA_VERSION 3
+#define TAO_VERSION "2.3.3"
author	Johnny Willemsen <jwillemsen@remedy.nl>	2015-09-17 08:51:32 +0200
committer	Johnny Willemsen <jwillemsen@remedy.nl>	2015-09-17 08:51:32 +0200
commit	00c547d2bc3a7e41340c050d832dda34f26e0bdc (patch)
tree	fdbf7b160f581a7e9faef0b03d330923f51014aa
parent	a44a059aea4e965b7a0fb58490fb49e574b6d369 (diff)
download	ATCD-00c547d2bc3a7e41340c050d832dda34f26e0bdc.tar.gz