summaryrefslogtreecommitdiffstats
path: root/LICENSE.txt
diff options
context:
space:
mode:
authorLusheng Ji <lji@research.att.com>2017-08-29 14:19:27 +0000
committerLusheng Ji <lji@research.att.com>2017-08-30 14:27:32 +0000
commit64fc1cdba89095151ee1607190a8f3587eea22b5 (patch)
tree20a00fd1394b31c5772f9933124fffef2abb1471 /LICENSE.txt
parent16a9c5b8c6b91ea856450d99cdfa6a18c57b7f1b (diff)
Update LICENSE.txt
Issue-Id: DCAEGEN2-86 Change-Id: I1211186bbb418af12f6ebcee0af111d727213975 Signed-off-by: Lusheng Ji <lji@research.att.com>
Diffstat (limited to 'LICENSE.txt')
-rw-r--r--LICENSE.txt70
1 files changed, 39 insertions, 31 deletions
diff --git a/LICENSE.txt b/LICENSE.txt
index cb8008a..69d5fc1 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,32 +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=========================================================
-
-ECOMP is a trademark and service mark of AT&T Intellectual Property.
-
-
-Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
-===================================================================
-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, 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.