diff options
author | Ross Brattain <ross.b.brattain@intel.com> | 2017-11-10 15:21:32 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-11-10 15:21:33 +0000 |
commit | 33c4ec6a7bb4abd30aeb3294950a57b70ac7bc6e (patch) | |
tree | a8c91fa085edc1db15846f5903ae994ca5f45f13 /samples/vnf_samples/nsut | |
parent | f9eadced5bdd726b4977738c634a26eef053dd2f (diff) | |
parent | 6e246403ca1240caa5ac63f9dd335e7e9e6603e3 (diff) |
Merge "NSB: fix vpe_config license" into stable/euphrates
Diffstat (limited to 'samples/vnf_samples/nsut')
-rwxr-xr-x | samples/vnf_samples/nsut/vpe/vpe_config/full_tm_profile_10G.cfg | 37 |
1 files 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: |