aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay Venkatesh Kumar <vv770d@att.com>2017-06-12 02:45:17 +0000
committerGerrit Code Review <gerrit@onap.org>2017-06-12 02:45:17 +0000
commite6fc418c92d7dc105ef73a3fc1274dc8da2c7eb5 (patch)
tree931154b6f2fddac53e35a242c651722907144bb2
parent56cb73914fd05db40417a6219b5968c8eea8a0b6 (diff)
parent762661a3cbb5ccdbd375e5bc30bc9f3b99ab8bc8 (diff)
Merge "[DCAE-11] update root license"HEADmaster
-rw-r--r--LICENSE.txt12
1 files changed, 5 insertions, 7 deletions
diff --git a/LICENSE.txt b/LICENSE.txt
index 30471b5..1183595 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,15 +1,13 @@
-
-/*-
+/*
* ============LICENSE_START==========================================
- * OPENECOMP - DCAE
* ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017 AT&T Intellectual Property. 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
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,6 +15,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
* ============LICENSE_END============================================
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ *
*/
-
-ECOMP and OpenECOMP are trademarks and service marks of AT&T Intellectual Property.