From 2416ea24d93ab63522586539e6e793f1102f9e0f Mon Sep 17 00:00:00 2001 From: Ivy Lim Date: Fri, 29 Mar 2019 14:31:43 -0400 Subject: [PATCH] Added gitreview and edited license text Change-Id: I793024b2cd94f9ee6620812351b7c5abefe2ac2f Signed-off-by: Ivy Lim --- .gitreview | 5 +++++ LICENSE.txt | 45 +++++++++++++++++++++++++++++---------------- 2 files changed, 34 insertions(+), 16 deletions(-) create mode 100644 .gitreview diff --git a/.gitreview b/.gitreview new file mode 100644 index 0000000..a48b7fb --- /dev/null +++ b/.gitreview @@ -0,0 +1,5 @@ +[gerrit] +host=gerrit.oran-osc.org +port=29418 +project=oran-osc.github.io.git + diff --git a/LICENSE.txt b/LICENSE.txt index 2b3e9de..f1459cb 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,21 +1,34 @@ -============LICENSE_START========================================== -O-RAN OSC -=================================================================== -Copyright (c) 2019 Nokia -Copyright (c) 2018-2019 AT&T Intellectual Property. -=================================================================== -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 otherwise specified, all software contained herein is licensed +under the Apache License, Version 2.0 (the "Software License"); +you may not use this software except in compliance with the Software +License. You may obtain a copy of the Software 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, +distributed under the Software 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. +See the Software License for the specific language governing permissions +and limitations under the Software License. + + + +Unless otherwise specified, all documentation contained herein is licensed +under the Creative Commons License, Attribution 4.0 Intl. (the +"Documentation License"); you may not use this documentation except in +compliance with the Documentation License. You may obtain a copy of the +Documentation License at + +https://creativecommons.org/licenses/by/4.0/ -For the bootstrap that code is used under the MIT License, as permitted by +Unless required by applicable law or agreed to in writing, documentation +distributed under the Documentation License is distributed on an "AS IS" +BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +implied. See the Documentation License for the specific language governing +permissions and limitations under the Documentation License. + + + +For the bootstrap that code is used under the MIT License, as permitted by https://github.com/BlackrockDigital/startbootstrap-landing-page/blob/master/LICENSE -============LICENSE_END============================================ + -- 2.16.6