You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2011/03/17 17:06:55 UTC
svn commit: r1082547 - in /trafficserver/traffic/tags/2.1.7: ./ ci/
lib/tsconfig/
Author: jplevyak
Date: Thu Mar 17 16:06:55 2011
New Revision: 1082547
URL: http://svn.apache.org/viewvc?rev=1082547&view=rev
Log:
Merge from trunk
Modified:
trafficserver/traffic/tags/2.1.7/ (props changed)
trafficserver/traffic/tags/2.1.7/NOTICE
trafficserver/traffic/tags/2.1.7/STATUS
trafficserver/traffic/tags/2.1.7/ci/rat-excludes.txt
trafficserver/traffic/tags/2.1.7/lib/tsconfig/Errata.cc
trafficserver/traffic/tags/2.1.7/lib/tsconfig/Errata.h
trafficserver/traffic/tags/2.1.7/lib/tsconfig/IntrusivePtr.h
trafficserver/traffic/tags/2.1.7/lib/tsconfig/NumericType.h
trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsBuffer.h
trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsBuilder.cc
trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsBuilder.h
trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsConfigGrammar.y
trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsConfigParseEvents.h
trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsConfigSyntax.l
trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsConfigTypes.h
trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsErrataUtil.cc
trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsErrataUtil.h
trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsValue.cc
trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsValue.h
trafficserver/traffic/tags/2.1.7/lib/tsconfig/test-tsconfig.cc
Propchange: trafficserver/traffic/tags/2.1.7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 17 16:06: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:1082535-1082544
Modified: trafficserver/traffic/tags/2.1.7/NOTICE
URL: http://svn.apache.org/viewvc/trafficserver/traffic/tags/2.1.7/NOTICE?rev=1082547&r1=1082546&r2=1082547&view=diff
==============================================================================
--- trafficserver/traffic/tags/2.1.7/NOTICE (original)
+++ trafficserver/traffic/tags/2.1.7/NOTICE Thu Mar 17 16:06:55 2011
@@ -17,4 +17,10 @@ You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
+~~~
+lib/wccp developed by Network Geographics on behalf of Pavlov Media.
+Copyright (C) 2010 Pavlov Media, Inc.
+
+lib/tsconfig
+Copyright (C) 2010 Network Geographics, Inc.
Modified: trafficserver/traffic/tags/2.1.7/STATUS
URL: http://svn.apache.org/viewvc/trafficserver/traffic/tags/2.1.7/STATUS?rev=1082547&r1=1082546&r2=1082547&view=diff
==============================================================================
--- trafficserver/traffic/tags/2.1.7/STATUS (original)
+++ trafficserver/traffic/tags/2.1.7/STATUS Thu Mar 17 16:06:55 2011
@@ -10,6 +10,7 @@ Release history:
[NOTE that x.{odd}.z versions are strictly Alpha/Beta releases,
while x.{even}.z versions are Stable/GA releases.]
+ 2.1.7-unstable : Released on March 21, 2011
2.1.6-unstable : Released on March 3, 2011
2.1.5-unstable : Released on January 12, 2011
2.1.4-unstable : Released on November 12, 2010
@@ -37,7 +38,7 @@ RELEASE SHOWSTOPPERS:
A list of all bugs scheduled for the next release can be found at
- http://s.apache.org/ts-2.1.7
+ http://s.apache.org/ts-2.1.8
RELEASE PROCESS
Modified: trafficserver/traffic/tags/2.1.7/ci/rat-excludes.txt
URL: http://svn.apache.org/viewvc/trafficserver/traffic/tags/2.1.7/ci/rat-excludes.txt?rev=1082547&r1=1082546&r2=1082547&view=diff
==============================================================================
--- trafficserver/traffic/tags/2.1.7/ci/rat-excludes.txt (original)
+++ trafficserver/traffic/tags/2.1.7/ci/rat-excludes.txt Thu Mar 17 16:06:55 2011
@@ -98,3 +98,4 @@ mgmt/traffic_manager
proxy/traffic_logcat
proxy/traffic_logstats
proxy/traffic_sac
+lib/tsconfig/test-1.tsconfig
Modified: trafficserver/traffic/tags/2.1.7/lib/tsconfig/Errata.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/tags/2.1.7/lib/tsconfig/Errata.cc?rev=1082547&r1=1082546&r2=1082547&view=diff
==============================================================================
--- trafficserver/traffic/tags/2.1.7/lib/tsconfig/Errata.cc (original)
+++ trafficserver/traffic/tags/2.1.7/lib/tsconfig/Errata.cc Thu Mar 17 16:06:55 2011
@@ -1,13 +1,17 @@
/** @file
Errata implementation.
- Copyright 2010 Network Geographics, Inc.
+ @section license License
- Licensed 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
+ 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
+ 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,
Modified: trafficserver/traffic/tags/2.1.7/lib/tsconfig/Errata.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/tags/2.1.7/lib/tsconfig/Errata.h?rev=1082547&r1=1082546&r2=1082547&view=diff
==============================================================================
--- trafficserver/traffic/tags/2.1.7/lib/tsconfig/Errata.h (original)
+++ trafficserver/traffic/tags/2.1.7/lib/tsconfig/Errata.h Thu Mar 17 16:06:55 2011
@@ -46,13 +46,17 @@
deeply nested functions easy while preserving the ability of the
top level logic to control such logging.
- Copyright 2010 Network Geographics, Inc.
+ @section license License
- Licensed 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
+ 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
+ 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,
Modified: trafficserver/traffic/tags/2.1.7/lib/tsconfig/IntrusivePtr.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/tags/2.1.7/lib/tsconfig/IntrusivePtr.h?rev=1082547&r1=1082546&r2=1082547&view=diff
==============================================================================
--- trafficserver/traffic/tags/2.1.7/lib/tsconfig/IntrusivePtr.h (original)
+++ trafficserver/traffic/tags/2.1.7/lib/tsconfig/IntrusivePtr.h Thu Mar 17 16:06:55 2011
@@ -12,13 +12,17 @@
This style of shared pointer also requires explicit support from the
target class, which must provide an internal reference counter.
- Copyright 2010 Network Geographics, Inc.
+ @section license License
- Licensed 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
+ 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
+ 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,
Modified: trafficserver/traffic/tags/2.1.7/lib/tsconfig/NumericType.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/tags/2.1.7/lib/tsconfig/NumericType.h?rev=1082547&r1=1082546&r2=1082547&view=diff
==============================================================================
--- trafficserver/traffic/tags/2.1.7/lib/tsconfig/NumericType.h (original)
+++ trafficserver/traffic/tags/2.1.7/lib/tsconfig/NumericType.h Thu Mar 17 16:06:55 2011
@@ -22,13 +22,17 @@
It is not necessary to ever mention some_random_tag_name
again. All we need is the entry in the symbol table.
- Copyright 2010 Network Geographics, Inc.
+ @section license License
- Licensed 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
+ 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
+ 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,
Modified: trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsBuffer.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsBuffer.h?rev=1082547&r1=1082546&r2=1082547&view=diff
==============================================================================
--- trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsBuffer.h (original)
+++ trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsBuffer.h Thu Mar 17 16:06:55 2011
@@ -4,13 +4,17 @@
/** @file
Definitions for a buffer type, to carry a reference to a chunk of memory.
- Copyright 2010 Network Geographics, Inc.
+ @section license License
- Licensed 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
+ 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
+ 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,
Modified: trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsBuilder.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsBuilder.cc?rev=1082547&r1=1082546&r2=1082547&view=diff
==============================================================================
--- trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsBuilder.cc (original)
+++ trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsBuilder.cc Thu Mar 17 16:06:55 2011
@@ -2,13 +2,17 @@
Implementation of the handler for parsing events.
- Copyright 2010 Network Geographics, Inc.
+ @section license License
- Licensed 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
+ 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
+ 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,
Modified: trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsBuilder.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsBuilder.h?rev=1082547&r1=1082546&r2=1082547&view=diff
==============================================================================
--- trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsBuilder.h (original)
+++ trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsBuilder.h Thu Mar 17 16:06:55 2011
@@ -5,13 +5,17 @@
Header for handler for parsing events.
- Copyright 2010 Network Geographics, Inc.
+ @section license License
- Licensed 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
+ 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
+ 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,
Modified: trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsConfigGrammar.y
URL: http://svn.apache.org/viewvc/trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsConfigGrammar.y?rev=1082547&r1=1082546&r2=1082547&view=diff
==============================================================================
--- trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsConfigGrammar.y (original)
+++ trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsConfigGrammar.y Thu Mar 17 16:06:55 2011
@@ -3,13 +3,17 @@
TS Configuration grammar.
- Copyright 2010 Network Geographics, Inc.
+ @section license License
- Licensed 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
+ 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
+ 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,
Modified: trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsConfigParseEvents.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsConfigParseEvents.h?rev=1082547&r1=1082546&r2=1082547&view=diff
==============================================================================
--- trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsConfigParseEvents.h (original)
+++ trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsConfigParseEvents.h Thu Mar 17 16:06:55 2011
@@ -5,13 +5,17 @@
Definition of parsing events and handlers.
- Copyright 2010 Network Geographics, Inc.
+ @section license License
- Licensed 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
+ 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
+ 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,
Modified: trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsConfigSyntax.l
URL: http://svn.apache.org/viewvc/trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsConfigSyntax.l?rev=1082547&r1=1082546&r2=1082547&view=diff
==============================================================================
--- trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsConfigSyntax.l (original)
+++ trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsConfigSyntax.l Thu Mar 17 16:06:55 2011
@@ -10,7 +10,7 @@
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
+ 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,
Modified: trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsConfigTypes.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsConfigTypes.h?rev=1082547&r1=1082546&r2=1082547&view=diff
==============================================================================
--- trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsConfigTypes.h (original)
+++ trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsConfigTypes.h Thu Mar 17 16:06:55 2011
@@ -5,13 +5,17 @@
Basic types for configuration parsing.
- Copyright 2010 Network Geographics, Inc.
+ @section license License
- Licensed 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
+ 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
+ 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,
Modified: trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsErrataUtil.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsErrataUtil.cc?rev=1082547&r1=1082546&r2=1082547&view=diff
==============================================================================
--- trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsErrataUtil.cc (original)
+++ trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsErrataUtil.cc Thu Mar 17 16:06:55 2011
@@ -2,13 +2,17 @@
TS Configuration utilities for Errata and logging.
- Copyright 2010 Network Geographics, Inc.
+ @section license License
- Licensed 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
+ 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
+ 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,
Modified: trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsErrataUtil.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsErrataUtil.h?rev=1082547&r1=1082546&r2=1082547&view=diff
==============================================================================
--- trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsErrataUtil.h (original)
+++ trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsErrataUtil.h Thu Mar 17 16:06:55 2011
@@ -2,13 +2,17 @@
TS Configuration utilities for Errata and logging.
- Copyright 2010 Network Geographics, Inc.
+ @section license License
- Licensed 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
+ 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
+ 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,
Modified: trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsValue.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsValue.cc?rev=1082547&r1=1082546&r2=1082547&view=diff
==============================================================================
--- trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsValue.cc (original)
+++ trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsValue.cc Thu Mar 17 16:06:55 2011
@@ -2,13 +2,17 @@
TS Configuration API implementation.
- Copyright 2010 Network Geographics, Inc.
+ @section license License
- Licensed 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
+ 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
+ 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,
Modified: trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsValue.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsValue.h?rev=1082547&r1=1082546&r2=1082547&view=diff
==============================================================================
--- trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsValue.h (original)
+++ trafficserver/traffic/tags/2.1.7/lib/tsconfig/TsValue.h Thu Mar 17 16:06:55 2011
@@ -5,13 +5,17 @@
TS Configuration API definition.
- Copyright 2010 Network Geographics, Inc.
+ @section license License
- Licensed 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
+ 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
+ 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,
Modified: trafficserver/traffic/tags/2.1.7/lib/tsconfig/test-tsconfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/tags/2.1.7/lib/tsconfig/test-tsconfig.cc?rev=1082547&r1=1082546&r2=1082547&view=diff
==============================================================================
--- trafficserver/traffic/tags/2.1.7/lib/tsconfig/test-tsconfig.cc (original)
+++ trafficserver/traffic/tags/2.1.7/lib/tsconfig/test-tsconfig.cc Thu Mar 17 16:06:55 2011
@@ -1,3 +1,23 @@
+/** @file
+ @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.
+*/
+
# include "tsconfig/TsValue.h"
# include <stdio.h>
# include <iostream>