trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject svn commit: r1056568 - in /trafficserver/traffic/tags/2.1.5: ./ ci/rat-excludes.txt lib/tsconfig/TsConfigLexer.h proxy/api/ts/TsException.h
Date Sat, 08 Jan 2011 00:20:55 GMT
Author: zwoop
Date: Sat Jan  8 00:20:55 2011
New Revision: 1056568

URL: http://svn.apache.org/viewvc?rev=1056568&view=rev
Log:
Merge from trunk fixes for RAT report

Modified:
    trafficserver/traffic/tags/2.1.5/   (props changed)
    trafficserver/traffic/tags/2.1.5/ci/rat-excludes.txt
    trafficserver/traffic/tags/2.1.5/lib/tsconfig/TsConfigLexer.h
    trafficserver/traffic/tags/2.1.5/proxy/api/ts/TsException.h

Propchange: trafficserver/traffic/tags/2.1.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan  8 00:20:55 2011
@@ -1,3 +1,4 @@
 /incubator/trafficserver/traffic/branches/dev:891823-915885
 /trafficserver/traffic/branches/ts-291:965529-991993
 /trafficserver/traffic/branches/wccp:1021790-1040544
+/trafficserver/traffic/trunk:1056566-1056567

Modified: trafficserver/traffic/tags/2.1.5/ci/rat-excludes.txt
URL: http://svn.apache.org/viewvc/trafficserver/traffic/tags/2.1.5/ci/rat-excludes.txt?rev=1056568&r1=1056567&r2=1056568&view=diff
==============================================================================
--- trafficserver/traffic/tags/2.1.5/ci/rat-excludes.txt (original)
+++ trafficserver/traffic/tags/2.1.5/ci/rat-excludes.txt Sat Jan  8 00:20:55 2011
@@ -84,8 +84,10 @@ lib/ts/ink_res_init.cc
 lib/ts/ink_res_mkquery.cc
 lib/ts/ink_rand.h
 lib/ts/ink_rand.cc
+lib/tsconfig/BisonHeaderToC++.sed
 README.libev
 README-EC2
 REVIEWERS
 contrib/perl/AdminClient/Changes
 contrib/perl/AdminClient/MANIFEST
+ats-install/

Modified: trafficserver/traffic/tags/2.1.5/lib/tsconfig/TsConfigLexer.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/tags/2.1.5/lib/tsconfig/TsConfigLexer.h?rev=1056568&r1=1056567&r2=1056568&view=diff
==============================================================================
--- trafficserver/traffic/tags/2.1.5/lib/tsconfig/TsConfigLexer.h (original)
+++ trafficserver/traffic/tags/2.1.5/lib/tsconfig/TsConfigLexer.h Sat Jan  8 00:20:55 2011
@@ -1,3 +1,26 @@
+/** @file
+
+    A brief file description
+
+    @section license License
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
 # if ! defined(TS_CONFIG_LEXER_HEADER)
 # define TS_CONFIG_LEXER_HEADER
 

Modified: trafficserver/traffic/tags/2.1.5/proxy/api/ts/TsException.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/tags/2.1.5/proxy/api/ts/TsException.h?rev=1056568&r1=1056567&r2=1056568&view=diff
==============================================================================
--- trafficserver/traffic/tags/2.1.5/proxy/api/ts/TsException.h (original)
+++ trafficserver/traffic/tags/2.1.5/proxy/api/ts/TsException.h Sat Jan  8 00:20:55 2011
@@ -1,8 +1,31 @@
+/** @file
+
+    A brief file description
+
+    @section license License
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
 # if ! defined(TS_EXCEPTION_HEADER)
 # define TS_EXCEPTION_HEADER
 
 /** @file
-    Apach Traffic Server Exceptions.
+    Apache Traffic Server Exceptions.
  */
 
 # include <stddef.h>



Mime
View raw message