trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject svn commit: r937578 - in /incubator/trafficserver/traffic/tags/2.0.0: ./ libinktomi++/ink_res_init.cc libinktomi++/ink_res_mkquery.cc libinktomi++/ink_resolver.h
Date Sat, 24 Apr 2010 02:29:01 GMT
Author: zwoop
Date: Sat Apr 24 02:29:01 2010
New Revision: 937578

URL: http://svn.apache.org/viewvc?rev=937578&view=rev
Log:
Merged John's changes from r937549

Modified:
    incubator/trafficserver/traffic/tags/2.0.0/   (props changed)
    incubator/trafficserver/traffic/tags/2.0.0/libinktomi++/ink_res_init.cc
    incubator/trafficserver/traffic/tags/2.0.0/libinktomi++/ink_res_mkquery.cc
    incubator/trafficserver/traffic/tags/2.0.0/libinktomi++/ink_resolver.h

Propchange: incubator/trafficserver/traffic/tags/2.0.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 24 02:29:01 2010
@@ -1 +1,2 @@
+/incubator/trafficserver/traffic/branches/2.0.x:937549
 /incubator/trafficserver/traffic/trunk:921639,921965,922056,923986,926907,936014

Modified: incubator/trafficserver/traffic/tags/2.0.0/libinktomi++/ink_res_init.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/tags/2.0.0/libinktomi%2B%2B/ink_res_init.cc?rev=937578&r1=937577&r2=937578&view=diff
==============================================================================
--- incubator/trafficserver/traffic/tags/2.0.0/libinktomi++/ink_res_init.cc (original)
+++ incubator/trafficserver/traffic/tags/2.0.0/libinktomi++/ink_res_init.cc Sat Apr 24 02:29:01
2010
@@ -10,11 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -71,7 +67,6 @@
 
 #if !defined (_WIN32)
 #if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)res_init.c	8.1 (Berkeley) 6/7/93";
 
 #endif /* LIBC_SCCS and not lint */
 

Modified: incubator/trafficserver/traffic/tags/2.0.0/libinktomi++/ink_res_mkquery.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/tags/2.0.0/libinktomi%2B%2B/ink_res_mkquery.cc?rev=937578&r1=937577&r2=937578&view=diff
==============================================================================
--- incubator/trafficserver/traffic/tags/2.0.0/libinktomi++/ink_res_mkquery.cc (original)
+++ incubator/trafficserver/traffic/tags/2.0.0/libinktomi++/ink_res_mkquery.cc Sat Apr 24
02:29:01 2010
@@ -10,11 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  * 
@@ -69,10 +65,6 @@
  */
 
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)res_mkquery.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_mkquery.c,v 1.6.672.1 2008/04/03 02:12:21 marka Exp
$";
-#endif /* LIBC_SCCS and not lint */
 
 
 #include <sys/types.h>

Modified: incubator/trafficserver/traffic/tags/2.0.0/libinktomi++/ink_resolver.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/tags/2.0.0/libinktomi%2B%2B/ink_resolver.h?rev=937578&r1=937577&r2=937578&view=diff
==============================================================================
--- incubator/trafficserver/traffic/tags/2.0.0/libinktomi++/ink_resolver.h (original)
+++ incubator/trafficserver/traffic/tags/2.0.0/libinktomi++/ink_resolver.h Sat Apr 24 02:29:01
2010
@@ -10,11 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *



Mime
View raw message