Merge branch 'develop' into 'develop_2.1.1' (55f55325) · Commits · MEC - Multi-access Edge Computing / MEC Application Support API and MEC Service Management API

COPYRIGHT

deleted100644 → 0

+0 −14

Original line number	Diff line number	Diff line
		ETSI FORGE COPYRIGHT STATEMENT

		Copyright (c) ETSI 2017.

		This software is subject to copyrights owned by ETSI. Non-exclusive permission
		is hereby granted, free of charge, to copy, reproduce and amend this file
		under the following conditions: It is provided "as is", without warranty of any
		kind, expressed or implied.

		ETSI shall never be liable for any claim, damages, or other liability arising
		from its use or inability of use.This permission does not apply to any documentation
		associated with this file for which ETSI keeps all rights reserved. The present
		copyright notice shall be included in all copies of whole or part of this
		software and shall not imply any sub-license right.

0 → 100644

+23 −0

Original line number	Diff line number	Diff line
		Copyright 2019 ETSI

		Redistribution and use in source and binary forms, with or without
		modification, are permitted provided that the following conditions are met:
		1. Redistributions of source code must retain the above copyright notice,
		this list of conditions and the following disclaimer.
		2. 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.
		3. Neither the name of the copyright holder 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 HOLDER 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.
		No newline at end of file

+3 −3

Original line number	Diff line number	Diff line
		@@ -13,8 +13,8 @@
		"version": "2.1.1",
		"description": "The ETSI MEC ISG MEC011 MEC Application Support API described using OpenAPI",
		"license": {
		"name": "ETSI Forge copyright notice",
		"url": "https://forge.etsi.org/etsi-forge-copyright-notice.txt"
		"name": "BSD-3-Clause",
		"url": "https://forge.etsi.org/legal-matters"
		},
		"contact": {
		"email": "cti_support@etsi.org"

+2 −2

Original line number	Diff line number	Diff line
		@@ -7,8 +7,8 @@ info:
		version: 2.1.1
		description: The ETSI MEC ISG MEC011 MEC Application Support API described using OpenAPI
		license:
		name: ETSI Forge copyright notice
		url: 'https://forge.etsi.org/etsi-forge-copyright-notice.txt'
		name: BSD-3-Clause
		url: 'https://forge.etsi.org/legal-matters'
		contact:
		email: cti_support@etsi.org
		externalDocs:

+3 −3

Original line number	Diff line number	Diff line
		@@ -13,8 +13,8 @@
		"version": "2.1.1",
		"description": "The ETSI MEC ISG MEC011 MEC Service Management API described using OpenAPI",
		"license": {
		"name": "ETSI Forge copyright notice",
		"url": "https://forge.etsi.org/etsi-forge-copyright-notice.txt"
		"name": "BSD-3-Clause",
		"url": "https://forge.etsi.org/legal-matters"
		},
		"contact": {
		"email": "cti_support@etsi.org"