From 6e246403ca1240caa5ac63f9dd335e7e9e6603e3 Mon Sep 17 00:00:00 2001 From: Ross Brattain Date: Thu, 9 Nov 2017 15:40:23 +0000 Subject: NSB: fix vpe_config license Use Apache 2.0 Change-Id: I199d09f04a5c84a25bd91dceba5e4ed1f93075f6 Signed-off-by: Ross Brattain (cherry picked from commit 3e62c0669b73fd5a4b4d0d7e7a214853b343574a) --- .../nsut/vpe/vpe_config/full_tm_profile_10G.cfg | 37 ++++++---------------- 1 file changed, 10 insertions(+), 27 deletions(-) diff --git a/samples/vnf_samples/nsut/vpe/vpe_config/full_tm_profile_10G.cfg b/samples/vnf_samples/nsut/vpe/vpe_config/full_tm_profile_10G.cfg index 502655fd0..8676a0774 100755 --- a/samples/vnf_samples/nsut/vpe/vpe_config/full_tm_profile_10G.cfg +++ b/samples/vnf_samples/nsut/vpe/vpe_config/full_tm_profile_10G.cfg @@ -1,33 +1,16 @@ -; BSD LICENSE +; Copyright (c) 2017 Intel Corporation ; -; Copyright(c) 2010-2014 Intel Corporation. All rights reserved. -; All rights reserved. +; 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 ; -; Redistribution and use in source and binary forms, with or without -; modification, are permitted provided that the following conditions -; are met: +; http://www.apache.org/licenses/LICENSE-2.0 ; -; * 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. +; 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. ; This file enables the following hierarchical scheduler configuration for each ; 10GbE output port: -- cgit 1.2.3-korg