summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-06-25 13:36:13 +0000
committerjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-06-25 13:36:13 +0000
commit114e864cfaffb078868739a590f80e1a6f605310 (patch)
tree8db069fa9e5ac83f274dd1f7e0f35541d084fcb6
parent1d60082f459af129713998c5cef7ccda019a8d0d (diff)
downloadATCD-114e864cfaffb078868739a590f80e1a6f605310.tar.gz
ChangeLogTag: Wed Jun 25 13:35:06 UTC 2008 J.T. Conklin <jtc@acorntoolworks.com>
-rw-r--r--TAO/ChangeLog8
-rw-r--r--TAO/configure.ac2
2 files changed, 9 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index bfb1fea4db6..d2d6b681f7e 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Wed Jun 25 13:35:06 UTC 2008 J.T. Conklin <jtc@acorntoolworks.com>
+
+ * configure.ac:
+
+ Remove orbsvcs/examples/Notify/Timeout/Makefile and add
+ orbsvcs/tests/Notify/Timeout/Makefile from list of makefiles
+ to generate.
+
Wed Jun 25 13:05:00 UTC 2008 Simon Massey <sma at prismtech dot com>
* tests/Bug_1254_Regression/client.cpp:
diff --git a/TAO/configure.ac b/TAO/configure.ac
index a0749ebaa95..2f9de26b948 100644
--- a/TAO/configure.ac
+++ b/TAO/configure.ac
@@ -290,7 +290,6 @@ AC_CONFIG_FILES([
orbsvcs/examples/Notify/MC/monitor/Makefile
orbsvcs/examples/Notify/Subscribe/Makefile
orbsvcs/examples/Notify/ThreadPool/Makefile
- orbsvcs/examples/Notify/Timeout/Makefile
orbsvcs/examples/ORT/Makefile
orbsvcs/examples/RtEC/Makefile
orbsvcs/examples/RtEC/IIOPGateway/Makefile
@@ -434,6 +433,7 @@ AC_CONFIG_FILES([
orbsvcs/tests/Notify/performance-tests/Filter/Makefile
orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile
orbsvcs/tests/Notify/performance-tests/Throughput/Makefile
+ orbsvcs/tests/Notify/Timeout/Makefile
orbsvcs/tests/Property/Makefile
orbsvcs/tests/Redundant_Naming/Makefile
orbsvcs/tests/Sched/Makefile