Thu Jul 12 17:11:35 2001 Krishnakumar B <kitty@cs.wustl.edu>

4 files changed, 107 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index b4584e94a95..fc6484cdcec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
+Thu Jul 12 17:11:35 2001  Krishnakumar B  <kitty@cs.wustl.edu>
+
+	* bin/nightlybuilds/builds.lst (WEB):
+
+	  Temporarily removed the IA-64 build till some issues get sorted
+          out.
+
 Thu Jul 12 06:01:03 2001  John Michael Zorko <j.zorko@att.net>
-  
+
         * netsvcs/lib/Server_Logging_Handler.cpp:
 	  Added an an additional #define in config-macosx.h called
  	  ACE_HAS_MACOSX_DYLIB, and checked to see if this was _not_
@@ -8,7 +15,7 @@ Thu Jul 12 06:01:03 2001  John Michael Zorko <j.zorko@att.net>
  	  (OS X version of .so) where they can't have any duplicate
  	  symbols, which is why libnetsvcs wasn't building on OS X
  	  earlier.  This fixes that.
-  
+
         * include/makeincludes/platform-macosx.GNU: Added -lACE to the
 	  LIBS line, which fixed the majority of the build problems.
 
@@ -421,10 +428,32 @@ Fri Jul  6 08:36:20 2001  Chad Elliott  <elliott_c@ociweb.com>
           contain Other.  The netsvcs library requires Naming_Context.
 
 Fri Jul  6 05:44:13 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+<<<<<<< ChangeLog
+<<<<<<< ChangeLog
+=======
 
         * ace/Makefile (LOGGING_FILES): Added support for
           Log_Msg_UNIX_Syslog.
+>>>>>>> 4.2247
+=======
+>>>>>>> 4.2257
+
+<<<<<<< ChangeLog
+        * ace/Makefile (LOGGING_FILES): Added support for
+          Log_Msg_UNIX_Syslog.
+
+        * ace/Log_Msg_UNIX_Syslog.{h,cpp}:
+        * ace/Log_Msg.cpp,
+        * ace/OS.h: Added support for a new UNIX syslog backend for the
+          ACE_Log_Msg class.  Thanks to Jerry D. De Master
+          <jdemaster@rite-solutions.com> and Robert Davidson
+          <robert@rdavidson.freeserve.co.uk>.
 
+        * ace/SOCK_Dgram.h: Fixed a typo in one of the send() method
+          comments.  Thanks to Alain Decamps <Alain.Decamps@PIDPA.be> for
+          reporting this.
+<<<<<<< ChangeLog
+=======
         * ace/Log_Msg_UNIX_Syslog.{h,cpp}:
         * ace/Log_Msg.cpp,
         * ace/OS.h: Added support for a new UNIX syslog backend for the
@@ -435,6 +464,9 @@ Fri Jul  6 05:44:13 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
         * ace/SOCK_Dgram.h: Fixed a typo in one of the send() method
           comments.  Thanks to Alain Decamps <Alain.Decamps@PIDPA.be> for
           reporting this.
+>>>>>>> 4.2247
+=======
+>>>>>>> 4.2257
 
         * ace/config-macosx.h: Added a new file courtesy of John
           Zorko so that things will work on MacOSX.
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index b4584e94a95..fc6484cdcec 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,5 +1,12 @@
+Thu Jul 12 17:11:35 2001  Krishnakumar B  <kitty@cs.wustl.edu>
+
+	* bin/nightlybuilds/builds.lst (WEB):
+
+	  Temporarily removed the IA-64 build till some issues get sorted
+          out.
+
 Thu Jul 12 06:01:03 2001  John Michael Zorko <j.zorko@att.net>
-  
+
         * netsvcs/lib/Server_Logging_Handler.cpp:
 	  Added an an additional #define in config-macosx.h called
  	  ACE_HAS_MACOSX_DYLIB, and checked to see if this was _not_
@@ -8,7 +15,7 @@ Thu Jul 12 06:01:03 2001  John Michael Zorko <j.zorko@att.net>
  	  (OS X version of .so) where they can't have any duplicate
  	  symbols, which is why libnetsvcs wasn't building on OS X
  	  earlier.  This fixes that.
-  
+
         * include/makeincludes/platform-macosx.GNU: Added -lACE to the
 	  LIBS line, which fixed the majority of the build problems.
 
@@ -421,10 +428,32 @@ Fri Jul  6 08:36:20 2001  Chad Elliott  <elliott_c@ociweb.com>
           contain Other.  The netsvcs library requires Naming_Context.
 
 Fri Jul  6 05:44:13 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+<<<<<<< ChangeLog
+<<<<<<< ChangeLog
+=======
 
         * ace/Makefile (LOGGING_FILES): Added support for
           Log_Msg_UNIX_Syslog.
+>>>>>>> 4.2247
+=======
+>>>>>>> 4.2257
+
+<<<<<<< ChangeLog
+        * ace/Makefile (LOGGING_FILES): Added support for
+          Log_Msg_UNIX_Syslog.
+
+        * ace/Log_Msg_UNIX_Syslog.{h,cpp}:
+        * ace/Log_Msg.cpp,
+        * ace/OS.h: Added support for a new UNIX syslog backend for the
+          ACE_Log_Msg class.  Thanks to Jerry D. De Master
+          <jdemaster@rite-solutions.com> and Robert Davidson
+          <robert@rdavidson.freeserve.co.uk>.
 
+        * ace/SOCK_Dgram.h: Fixed a typo in one of the send() method
+          comments.  Thanks to Alain Decamps <Alain.Decamps@PIDPA.be> for
+          reporting this.
+<<<<<<< ChangeLog
+=======
         * ace/Log_Msg_UNIX_Syslog.{h,cpp}:
         * ace/Log_Msg.cpp,
         * ace/OS.h: Added support for a new UNIX syslog backend for the
@@ -435,6 +464,9 @@ Fri Jul  6 05:44:13 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
         * ace/SOCK_Dgram.h: Fixed a typo in one of the send() method
           comments.  Thanks to Alain Decamps <Alain.Decamps@PIDPA.be> for
           reporting this.
+>>>>>>> 4.2247
+=======
+>>>>>>> 4.2257
 
         * ace/config-macosx.h: Added a new file courtesy of John
           Zorko so that things will work on MacOSX.
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index b4584e94a95..fc6484cdcec 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,5 +1,12 @@
+Thu Jul 12 17:11:35 2001  Krishnakumar B  <kitty@cs.wustl.edu>
+
+	* bin/nightlybuilds/builds.lst (WEB):
+
+	  Temporarily removed the IA-64 build till some issues get sorted
+          out.
+
 Thu Jul 12 06:01:03 2001  John Michael Zorko <j.zorko@att.net>
-  
+
         * netsvcs/lib/Server_Logging_Handler.cpp:
 	  Added an an additional #define in config-macosx.h called
  	  ACE_HAS_MACOSX_DYLIB, and checked to see if this was _not_
@@ -8,7 +15,7 @@ Thu Jul 12 06:01:03 2001  John Michael Zorko <j.zorko@att.net>
  	  (OS X version of .so) where they can't have any duplicate
  	  symbols, which is why libnetsvcs wasn't building on OS X
  	  earlier.  This fixes that.
-  
+
         * include/makeincludes/platform-macosx.GNU: Added -lACE to the
 	  LIBS line, which fixed the majority of the build problems.
 
@@ -421,10 +428,32 @@ Fri Jul  6 08:36:20 2001  Chad Elliott  <elliott_c@ociweb.com>
           contain Other.  The netsvcs library requires Naming_Context.
 
 Fri Jul  6 05:44:13 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+<<<<<<< ChangeLog
+<<<<<<< ChangeLog
+=======
 
         * ace/Makefile (LOGGING_FILES): Added support for
           Log_Msg_UNIX_Syslog.
+>>>>>>> 4.2247
+=======
+>>>>>>> 4.2257
+
+<<<<<<< ChangeLog
+        * ace/Makefile (LOGGING_FILES): Added support for
+          Log_Msg_UNIX_Syslog.
+
+        * ace/Log_Msg_UNIX_Syslog.{h,cpp}:
+        * ace/Log_Msg.cpp,
+        * ace/OS.h: Added support for a new UNIX syslog backend for the
+          ACE_Log_Msg class.  Thanks to Jerry D. De Master
+          <jdemaster@rite-solutions.com> and Robert Davidson
+          <robert@rdavidson.freeserve.co.uk>.
 
+        * ace/SOCK_Dgram.h: Fixed a typo in one of the send() method
+          comments.  Thanks to Alain Decamps <Alain.Decamps@PIDPA.be> for
+          reporting this.
+<<<<<<< ChangeLog
+=======
         * ace/Log_Msg_UNIX_Syslog.{h,cpp}:
         * ace/Log_Msg.cpp,
         * ace/OS.h: Added support for a new UNIX syslog backend for the
@@ -435,6 +464,9 @@ Fri Jul  6 05:44:13 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
         * ace/SOCK_Dgram.h: Fixed a typo in one of the send() method
           comments.  Thanks to Alain Decamps <Alain.Decamps@PIDPA.be> for
           reporting this.
+>>>>>>> 4.2247
+=======
+>>>>>>> 4.2257
 
         * ace/config-macosx.h: Added a new file courtesy of John
           Zorko so that things will work on MacOSX.
diff --git a/bin/nightlybuilds/builds.lst b/bin/nightlybuilds/builds.lst
index f036ab57f7c..d00491e08ef 100644
--- a/bin/nightlybuilds/builds.lst
+++ b/bin/nightlybuilds/builds.lst
@@ -195,10 +195,11 @@ TYPE = TIMEONLY
 LIST = http://ace.cs.wustl.edu/~bugzilla/auto_compile_logs/beguine.doc.wustl.edu_NO_AMI_MESSAGING/
 WEB  = http://ace.cs.wustl.edu/~bugzilla/cgi-bin/show_log_dir.cgi?beguine.doc.wustl.edu_NO_AMI_MESSAGING
 
-[RedHat_IA64_Linux]
-TYPE = TIMEONLY
-LIST = http://ace.cs.wustl.edu/~bugzilla/auto_compile_logs/yoda_Full
-WEB  = http://ace.cs.wustl.edu/~bugzilla/cgi-bin/show_log_dir.cgi?yoda_Full
+# Disabled showing of build on the scoreboard temporarily
+#[RedHat_IA64_Linux]
+#TYPE = TIMEONLY
+#LIST = http://ace.cs.wustl.edu/~bugzilla/auto_compile_logs/yoda_Full
+#WEB  = http://ace.cs.wustl.edu/~bugzilla/cgi-bin/show_log_dir.cgi?yoda_Full
 
 [Debian_NoInterceptors]
 TYPE = TIMEONLY