summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
Diffstat (limited to 'TAO')
-rw-r--r--TAO/ChangeLog4
-rw-r--r--TAO/PROBLEM-REPORT-FORM4
-rw-r--r--TAO/VERSION2
-rw-r--r--TAO/tao/Version.h4
4 files changed, 9 insertions, 5 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 067cd8c69ea..6089e5dc2ce 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,7 @@
+Wed Aug 29 08:16:04 CEST 2012 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * TAO version 2.1.4 released.
+
Tue Aug 28 09:30:31 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* orbsvcs/tests/Security/BiDirectional/ssl/ca.pem:
diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM
index bc9d0005d94..35c531294f0 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.1.3
- ACE VERSION: 6.1.3
+ TAO VERSION: 2.1.4
+ ACE VERSION: 6.1.4
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 6c6f646a34b..31b59deb00d 100644
--- a/TAO/VERSION
+++ b/TAO/VERSION
@@ -1,4 +1,4 @@
-This is TAO version 2.1.3, released Thu Jul 26 09:12:26 CEST 2012
+This is TAO version 2.1.4, released Wed Aug 29 08:16:04 CEST 2012
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 adb5f7552ee..a9560d6af55 100644
--- a/TAO/tao/Version.h
+++ b/TAO/tao/Version.h
@@ -5,5 +5,5 @@
#define TAO_MAJOR_VERSION 2
#define TAO_MINOR_VERSION 1
-#define TAO_BETA_VERSION 3
-#define TAO_VERSION "2.1.3"
+#define TAO_BETA_VERSION 4
+#define TAO_VERSION "2.1.4"