diff options
| author |   Dan Radez <dradez@redhat.com> | 2015-05-06 13:10:26 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-05-06 13:10:26 +0000 |
| commit | cce7eb9fc26c71eedfdbd0d289f4c484ea7ecc99 (patch) | |
| tree | 610657f1c581198134e5c2c45b58eda29058bb69 | |
| parent | 65be4937a4d713a5efdc724faa80305ae2ad9f8e (diff) | |
| parent | 7b3946819bc8f1eabb8f37de0e6f93772ea58801 (diff) | |
Merge "updating licensing information for the BGS components"
| -rw-r--r-- | LICENSE | 13 | ||||
| -rw-r--r-- | LICENSE.rst (renamed from fuel/LICENSE.rst) | 47 |
2 files changed, 39 insertions, 21 deletions
diff --git a/LICENSE b/LICENSE deleted file mode 100644 index eab0924..0000000 --- a/LICENSE +++ /dev/null @@ -1,13 +0,0 @@ -Copyright 2015 Open Platform for NFV Project, Inc. and its contributors - - 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. diff --git a/fuel/LICENSE.rst b/LICENSE.rst index 9537658..e8fa309 100644 --- a/fuel/LICENSE.rst +++ b/LICENSE.rst @@ -26,7 +26,7 @@ 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. -Other applicable upstream project Licenses relevant for Fuel@OPNFV +Other applicable upstream project Licenses ================================================================== You may not use the content of this software bundle except in compliance with the Licenses as listed below: @@ -58,8 +58,23 @@ Licenses as listed below: | Linux | GPLv3 | | | https://www.gnu.org/copyleft/gpl.html | +----------------+-----------------------------------------------------+ +| Ceph | GPL v2 | +| | https://www.gnu.org/licenses/gpl-2.0.html | ++----------------+-----------------------------------------------------+ +| Puppet | Apache License 2.0 | +| | https://www.apache.org/licenses/LICENSE-2.0 | ++----------------+-----------------------------------------------------+ + +Other applicable upstream project Licenses used by Fuel ISO +================================================================== +You may not use the content of this software bundle except in compliance with the +Licenses as listed below: + ++----------------+-----------------------------------------------------+ +| **Component** | **Licence** | ++----------------+-----------------------------------------------------+ | Docker | Apache License 2.0 | -| | https://www.apache.org/licenses/LICENSE-2.0 +| | https://www.apache.org/licenses/LICENSE-2.0 | +----------------+-----------------------------------------------------+ | Fuel | Apache License 2.0 | | | https://www.apache.org/licenses/LICENSE-2.0 | @@ -67,12 +82,6 @@ Licenses as listed below: | OpenJDK/JRE | GPL v2 | | | https://www.gnu.org/licenses/gpl-2.0.html | +----------------+-----------------------------------------------------+ -| Ceph | GPL v2 | -| | https://www.gnu.org/licenses/gpl-2.0.html | -+----------------+-----------------------------------------------------+ -| Puppet | Apache License 2.0 | -| | https://www.apache.org/licenses/LICENSE-2.0 | -+----------------+-----------------------------------------------------+ | Cobbler | GPL v2 | | | https://www.gnu.org/licenses/gpl-2.0.html | +----------------+-----------------------------------------------------+ @@ -83,3 +92,25 @@ Licenses as listed below: | | https://www.apache.org/licenses/LICENSE-2.0 | +----------------+-----------------------------------------------------+ +Other applicable upstream project Licenses used by Foreman ISO +================================================================== +You may not use the content of this software bundle except in compliance with the +Licenses as listed below: + ++----------------+-----------------------------------------------------+ +| **Component** | **Licence** | ++----------------+-----------------------------------------------------+ +| Foreman | Creative Commons Attribution-ShareAlike 3.0 | +| | http://creativecommons.org/licenses/by-sa/3.0/ | ++----------------+-----------------------------------------------------+ +| VirtualBox | GPL v2 | +| | https://www.gnu.org/licenses/gpl-2.0.html | ++----------------+-----------------------------------------------------+ +| Vagrant | The MIT License ++----------------+-----------------------------------------------------+ +| Ansible | GPL v3 | +| | https://www.gnu.org/licenses/gpl-3.0.html | ++----------------+-----------------------------------------------------+ +| Khaleesi | GPL v3 | +| | https://www.gnu.org/licenses/gpl-3.0.html | ++----------------+-----------------------------------------------------+ |