summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDR695H <dr695h@att.com>2017-09-08 15:52:44 -0400
committerDR695H <dr695h@att.com>2017-09-08 15:53:00 -0400
commit0d8141d265897f368d5d3fca52c3115dae14c332 (patch)
treeeae9f8e6b8884ed959c59b699315a9d13492af46
parentd40619e3230eb9d8e74028ec5e95d54bbb2d7e63 (diff)
[TEST-22] updating the license
Updates to License and Trademark in the Robot Frameworks Source Code Change-Id: I3f8987f444e8d31ca9b51939998782ae0937922f Signed-off-by: DR695H <dr695h@att.com>
-rw-r--r--LICENSE.TXT37
1 files changed, 14 insertions, 23 deletions
diff --git a/LICENSE.TXT b/LICENSE.TXT
index 4aa836cf..c74d0fb8 100644
--- a/LICENSE.TXT
+++ b/LICENSE.TXT
@@ -1,25 +1,16 @@
-ECOMP and OpenECOMP are trademarks and service marks of AT&T Intellectual Property.
+All Robot Frameworks source code, including files processed by ONAP itself (such as Heat Orchestration Templates, Yang modules, etc.) are governed by the following:
-LICENSE.TXT file can be appended as follows:
/*
- * ============LICENSE_START==========================================
- * ===================================================================
- * 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
- *
- * 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 and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
- *
- */ \ No newline at end of file
+
+ ============LICENSE_START=============================================================================================================
+ 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
+ *
+ 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.
+ */ \ No newline at end of file