4 files changed, 84 insertions, 7 deletions
diff --git a/TAO/ChangeLogs/TAO-2_5_15 b/TAO/ChangeLogs/TAO-2_5_15
new file mode 100644
index 00000000000..f2b532e4a29
--- /dev/null
+++ b/TAO/ChangeLogs/TAO-2_5_15
@@ -0,0 +1,77 @@
+commit e2e639121adf82de5183688b0d26fd0a6097dd3b
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Tue Aug 31 21:01:43 2021 -0500
+
+    Removed conv_lib.mpb
+    
+    Replaced uses of it with install_lib
+    
+    (cherry picked from commit 1bfbc674980869ef05c6fed94c01f291ff5fd7d4)
+
+commit 01c351d947d384751554b134232ca98a9e2f0a42
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Aug 26 16:35:59 2021 -0500
+
+    update for ace6tao2 branch
+
+commit b04549c0a1ccef03e8ebc08b2c3e7875d5147772
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Aug 26 16:32:34 2021 -0500
+
+    annotest_idl.mpc: simplify using tao_idl_fe.mpb now that it's fixed
+    
+    (cherry picked from commit b4b2c11a6121786288b489eca3e2f155bea26167)
+
+commit ddf34497171687b3e7310714a3efd6da96f8439a
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Aug 26 16:20:30 2021 -0500
+
+    Unit test for TAO_IDL_FE's AST
+    
+    (cherry picked from commit 5e2989a4d63b05cab291bd99acf2fdb00cb0578e)
+
+commit 8d13e38185201f272e619113cc901319d2319c9c
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Aug 26 16:17:44 2021 -0500
+
+    removed invalid base project from tao_idl_fe
+    
+    (cherry picked from commit 26c8e7643c6623ffee6c902203ec9b55c7f216cf)
+
+commit 3a344501bebb195b1728c209d3e162622e8ec506
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Aug 26 08:48:34 2021 -0500
+
+    TAO_IDL_FE: NT_fixed needs owns_base_type in typedef
+
+commit ee7ce31bfef2fff492986fb7a585d0e0804ae72e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 16 17:01:15 2021 +0200
+
+    Updated Embarcadero compiler checks
+    
+        * TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp:
+        * TAO/tests/Bug_3574_Regression/test.cpp:
+
+commit c2b320bec71aa87b0f58251df05146d7cf84f459
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 16 16:49:28 2021 +0200
+
+    Updated Embarcadero compiler checks
+    
+        * TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.h:
+        * TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h:
+
+commit 050a5a59990fd781fe33e464c82af448dbb6f32e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 16 16:34:29 2021 +0200
+
+    Updated compiler check
+    
+        * TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp:
+
+commit 448e4b00edd5d4e5e7ccdbbfcb97dbc686ecfdb5
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Aug 4 08:48:30 2021 +0200
+
+    Updated for next release
diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM
index 63c4a23aaa6..2475376e942 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.14
-    ACE VERSION: 6.5.14
+    TAO VERSION: 2.5.15
+    ACE VERSION: 6.5.15
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/TAO/VERSION.txt b/TAO/VERSION.txt
index bd16d5998b8..d02d28b8929 100644
--- a/TAO/VERSION.txt
+++ b/TAO/VERSION.txt
@@ -1,4 +1,4 @@
-This is TAO version 2.5.14, released Wed Aug 04 08:36:34 CEST 2021
+This is TAO version 2.5.15, released Wed Sep 29 09:17:26 CEST 2021
 
 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 a5eb72b9a35..dc51e2195d4 100644
--- a/TAO/tao/Version.h
+++ b/TAO/tao/Version.h
@@ -4,8 +4,8 @@
 
 #define TAO_MAJOR_VERSION 2
 #define TAO_MINOR_VERSION 5
-#define TAO_MICRO_VERSION 14
-#define TAO_BETA_VERSION 14
-#define TAO_VERSION "2.5.14"
-#define TAO_VERSION_CODE 0x2050e
+#define TAO_MICRO_VERSION 15
+#define TAO_BETA_VERSION 15
+#define TAO_VERSION "2.5.15"
+#define TAO_VERSION_CODE 0x2050f
 #define TAO_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))