From 1adba8edd44fdf5a3ecf3e80525e81dc9118bf7f Mon Sep 17 00:00:00 2001 From: DanielMartinBuckley Date: Tue, 7 Nov 2017 17:48:18 +0000 Subject: Fixed incorrect Copyright Notice Changed Copyright notice on tuples.lua from "Intel Copyright" to Apache 2.0 Change-Id: I85e6f9eb86c116d552f86cddf05b3b368b32f776 Signed-off-by: Daniel Martin Buckley (cherry picked from commit 204702db384241faffbf0848ad0bc63fa476b52d) --- samples/vnf_samples/nsut/prox/configs/tuples.lua | 37 +++++++----------------- 1 file changed, 10 insertions(+), 27 deletions(-) diff --git a/samples/vnf_samples/nsut/prox/configs/tuples.lua b/samples/vnf_samples/nsut/prox/configs/tuples.lua index 431125082..60a1b3ecd 100644 --- a/samples/vnf_samples/nsut/prox/configs/tuples.lua +++ b/samples/vnf_samples/nsut/prox/configs/tuples.lua @@ -1,34 +1,17 @@ +-- Copyright (c) 2016-2017 Intel Corporation -- --- Dataplane Automated Testing System +-- 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 -- --- Copyright (c) 2015-2017, Intel Corporation. --- All rights reserved. +-- http://www.apache.org/licenses/LICENSE-2.0 -- --- Redistribution and use in source and binary forms, with or without --- modification, are permitted provided that the following conditions --- are met: +-- 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. -- --- * Redistributions of source code must retain the above copyright --- notice, this list of conditions and the following disclaimer. --- * 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. --- * Neither the name of Intel Corporation nor the names of its --- contributors may be used to endorse or promote products derived --- from this software without specific prior written permission. --- --- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS --- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT --- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR --- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT --- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, --- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT --- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, --- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY --- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT --- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE --- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -- tuples = {}; -- cgit 1.2.3-korg