summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhangw <zhangw@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-01-30 17:25:48 +0000
committerzhangw <zhangw@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-01-30 17:25:48 +0000
commit919970ddb1fdec6007efa0e34082f076b7f4ec74 (patch)
tree5876b1541f07d1bbd957d8281c00577858ac8ecf
parent3a92deaba680b78c4d8d9d5a97aa68d3648ab31e (diff)
downloadATCD-919970ddb1fdec6007efa0e34082f076b7f4ec74.tar.gz
Mon Jan 30 17:22:50 UTC 2006 Wallace Zhang <zhangw@ociweb.com>
-rw-r--r--TAO/ChangeLog6
-rw-r--r--TAO/NEWS7
2 files changed, 9 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index dea558edd91..d1fff2cea72 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jan 30 17:22:50 UTC 2006 Wallace Zhang <zhangw@ociweb.com>
+
+ * NEWS:
+
+ Moved to the right place.
+
Mon Jan 30 17:09:25 UTC 2006 Simon McQueen <sm@prismtech.com>
* NEWS:
diff --git a/TAO/NEWS b/TAO/NEWS
index b315e48df79..949dbfc23af 100644
--- a/TAO/NEWS
+++ b/TAO/NEWS
@@ -56,6 +56,9 @@ USER VISIBLE CHANGES BETWEEN TAO-1.4.8 and TAO-1.4.9
compile-time option controlled by the #define TAO_USE_LOCAL_MEMORY_POOL
which defaults to 1 if not specified.
+. Add a property -ORBKeepalive to allow a user to specify that
+ SO_KEEPALIVE is set on IIOP connections. See docs/Options.html
+ and Bugzilla #2374.
USER VISIBLE CHANGES BETWEEN TAO-1.4.7 and TAO-1.4.8
====================================================
@@ -163,10 +166,6 @@ USER VISIBLE CHANGES BETWEEN TAO-1.4.7 and TAO-1.4.8
Service persistence mechanisms. See the service configurator file
in orbsvcs/tests/Notify/XML_Persistence for an example.
-. Add a property -ORBKeepalive to allow a user to specify that
- SO_KEEPALIVE is set on IIOP connections. See docs/Options.html
- and Bugzilla #2374.
-
USER VISIBLE CHANGES BETWEEN TAO-1.4.6 and TAO-1.4.7
====================================================