From c2ee282bbb719916efbef2324c4d8579f1e91692 Mon Sep 17 00:00:00 2001 From: Lucas Alvares Gomes Date: Mon, 2 Dec 2013 11:57:19 +0000 Subject: [PATCH] Incorporating MIT licensed code This patch attempts to clarify the licensing position held by the db.sqlalchemy.migration module. According to https://wiki.openstack.org/wiki/LegalIssuesFAQ when we have MIT licensed code in the project we have to update the toplevel LICENSE file to include the details of the license + a brief explanation of which code is under that license. This patch also fixes the license header on that module which was incomplete. Change-Id: I5675f3f6f63ac6432736a98e94fbe2cb3e32714f --- LICENSE | 29 +++++++++++++++++++++ openstack/common/db/sqlalchemy/migration.py | 3 ++- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 4143aac26..9f696d4a7 100644 --- a/LICENSE +++ b/LICENSE @@ -202,3 +202,32 @@ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +Licenses for incorporated software +================================== + +---------------------------------------------------------------------- + +The db.sqlalchemy.migration code was based on code originally licensed +under the MIT license: + +---------------------------------------------------------------------- +Copyright (c) 2009 Evan Rosson, Jan Dittberner, Domen Kožar + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/openstack/common/db/sqlalchemy/migration.py b/openstack/common/db/sqlalchemy/migration.py index 415435994..c72a0ec90 100644 --- a/openstack/common/db/sqlalchemy/migration.py +++ b/openstack/common/db/sqlalchemy/migration.py @@ -36,7 +36,8 @@ # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. import distutils.version as dist_version import os