summaryrefslogtreecommitdiffstats
path: root/LICENSE.txt
diff options
context:
space:
mode:
authorLusheng Ji <lji@research.att.com>2017-08-29 14:16:38 +0000
committerLusheng Ji <lji@research.att.com>2017-08-29 14:16:38 +0000
commit510c5aef5caf3149b7f890ca1f77029a748100ee (patch)
treeb40c8792f7e7248a2664b4cb5231241fcf651ba4 /LICENSE.txt
parentc58392ce625fe3aa58ac345cee503997d51e04b2 (diff)
Update LICENSE.txt
Issue-Id: DCAEGEN2-86 Change-Id: I30e0e4bd4cbbc0b6f60987806908fdc524f41466 Signed-off-by: Lusheng Ji <lji@research.att.com>
Diffstat (limited to 'LICENSE.txt')
-rw-r--r--LICENSE.txt55
1 files changed, 39 insertions, 16 deletions
diff --git a/LICENSE.txt b/LICENSE.txt
index 0430d42..69d5fc1 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,17 +1,40 @@
-============LICENSE_START=======================================================
-org.onap.dcae
-================================================================================
-Copyright (c) 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
+/*
+* ============LICENSE_START==========================================
+* ===================================================================
+* 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 software except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* 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,
+* 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.
+*
+*
+*
+* Unless otherwise specified, all documentation contained herein is licensed
+* under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+* you may not use this documentation except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* https://creativecommons.org/licenses/by/4.0/
+*
+* Unless required by applicable law or agreed to in writing, documentation
+* 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.
+*
+* ============LICENSE_END============================================
+*
+* ECOMP is a trademark and service mark of AT&T Intellectual Property.
+*
+*/
- 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,
-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.
-============LICENSE_END=========================================================