diff options
| author |   Marco Platania <platania@research.att.com> | 2017-10-23 14:25:33 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-10-23 14:25:33 +0000 |
| commit | a319ead95833ed8d4c5afe632ad535b0cdfbcd01 (patch) | |
| tree | 7014a81735add58c3e266e4faa0bf4ea30e3fe8f /vnfs/VES | |
| parent | 8ddf3e163f1931907e20addb60a4c9af21e5e9c5 (diff) | |
| parent | 9f228103bbdab8e4c0e014068a76aead80d27143 (diff) | |
Merge "Update License text"
Diffstat (limited to 'vnfs/VES')
| -rw-r--r-- | vnfs/VES/LICENSE.md | 4 | ||||
| -rw-r--r-- | vnfs/VES/code/evel_library/license.md | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/vnfs/VES/LICENSE.md b/vnfs/VES/LICENSE.md index ae12da20..16285cd2 100644 --- a/vnfs/VES/LICENSE.md +++ b/vnfs/VES/LICENSE.md @@ -3,6 +3,7 @@ * =================================================================== * Copyright © 2017 AT&T Intellectual Property. All rights reserved. * =================================================================== + * Unless otherwise specified, all software contained herein is * 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 @@ -16,7 +17,6 @@ * limitations under the License. * ============LICENSE_END============================================ * - * ECOMP and OpenECOMP are trademarks - * and service marks of AT&T Intellectual Property. + * ECOMP is trademark and service mark of AT&T Intellectual Property. * */ diff --git a/vnfs/VES/code/evel_library/license.md b/vnfs/VES/code/evel_library/license.md index d24c3180..adb3b5e7 100644 --- a/vnfs/VES/code/evel_library/license.md +++ b/vnfs/VES/code/evel_library/license.md @@ -12,6 +12,7 @@ This Licensing section describes licensing of IPR in the EVEL Library. =================================================================== Copyright © 2017 AT&T Intellectual Property. All rights reserved. =================================================================== +Unless otherwise specified, all software contained herein is 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 @@ -25,8 +26,7 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END============================================ -ECOMP and OpenECOMP are trademarks -and service marks of AT&T Intellectual Property. +ECOMP is trademark and service mark of AT&T Intellectual Property. ## libcurl {#lic_libcurl} @@ -85,4 +85,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -
\ No newline at end of file + |