aboutsummaryrefslogtreecommitdiffstats
path: root/vnfs/VES5.0/evel/evel-test-collector
diff options
context:
space:
mode:
authorMarco Platania <platania@research.att.com>2017-10-23 14:25:33 +0000
committerGerrit Code Review <gerrit@onap.org>2017-10-23 14:25:33 +0000
commita319ead95833ed8d4c5afe632ad535b0cdfbcd01 (patch)
tree7014a81735add58c3e266e4faa0bf4ea30e3fe8f /vnfs/VES5.0/evel/evel-test-collector
parent8ddf3e163f1931907e20addb60a4c9af21e5e9c5 (diff)
parent9f228103bbdab8e4c0e014068a76aead80d27143 (diff)
Merge "Update License text"
Diffstat (limited to 'vnfs/VES5.0/evel/evel-test-collector')
-rw-r--r--vnfs/VES5.0/evel/evel-test-collector/LICENSE.md2
-rw-r--r--vnfs/VES5.0/evel/evel-test-collector/code/collector/LICENSE.TXT4
-rw-r--r--vnfs/VES5.0/evel/evel-test-collector/docs/att_interface_definition/LICENSE.TXT4
-rw-r--r--vnfs/VES5.0/evel/evel-test-collector/docs/test_collector_user_guide/LICENSE.TXT4
4 files changed, 8 insertions, 6 deletions
diff --git a/vnfs/VES5.0/evel/evel-test-collector/LICENSE.md b/vnfs/VES5.0/evel/evel-test-collector/LICENSE.md
index afb56c99..a6642dc6 100644
--- a/vnfs/VES5.0/evel/evel-test-collector/LICENSE.md
+++ b/vnfs/VES5.0/evel/evel-test-collector/LICENSE.md
@@ -2,6 +2,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
@@ -13,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
****************************************************************************/
diff --git a/vnfs/VES5.0/evel/evel-test-collector/code/collector/LICENSE.TXT b/vnfs/VES5.0/evel/evel-test-collector/code/collector/LICENSE.TXT
index ae12da20..16285cd2 100644
--- a/vnfs/VES5.0/evel/evel-test-collector/code/collector/LICENSE.TXT
+++ b/vnfs/VES5.0/evel/evel-test-collector/code/collector/LICENSE.TXT
@@ -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/VES5.0/evel/evel-test-collector/docs/att_interface_definition/LICENSE.TXT b/vnfs/VES5.0/evel/evel-test-collector/docs/att_interface_definition/LICENSE.TXT
index ae12da20..16285cd2 100644
--- a/vnfs/VES5.0/evel/evel-test-collector/docs/att_interface_definition/LICENSE.TXT
+++ b/vnfs/VES5.0/evel/evel-test-collector/docs/att_interface_definition/LICENSE.TXT
@@ -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/VES5.0/evel/evel-test-collector/docs/test_collector_user_guide/LICENSE.TXT b/vnfs/VES5.0/evel/evel-test-collector/docs/test_collector_user_guide/LICENSE.TXT
index ae12da20..16285cd2 100644
--- a/vnfs/VES5.0/evel/evel-test-collector/docs/test_collector_user_guide/LICENSE.TXT
+++ b/vnfs/VES5.0/evel/evel-test-collector/docs/test_collector_user_guide/LICENSE.TXT
@@ -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.
*
*/