--- a/components/python/oslo.db/oslo.db.license Wed Sep 07 14:48:32 2016 -0700
+++ b/components/python/oslo.db/oslo.db.license Wed Sep 07 14:48:32 2016 -0700
@@ -1,4 +1,3 @@
-
The following applies to all products licensed under the Apache 2.0 License:
You may not use the identified files except in compliance with the Apache License, Version 2.0 (the "License.")
@@ -187,77 +186,6 @@
of your accepting any such warranty or additional liability.
============================================================
-oslo.db-1.0.2/oslo/__init__.py
-oslo.db-1.0.2/oslo/db/sqlalchemy/compat/handle_error.py
-oslo.db-1.0.2/oslo/db/sqlalchemy/compat/__init__.py
-oslo.db-1.0.2/oslo/db/sqlalchemy/compat/engine_connect.py
-oslo.db-1.0.2/oslo/db/sqlalchemy/compat/utils.py
-oslo.db-1.0.2/oslo/db/sqlalchemy/exc_filters.py
-oslo.db-1.0.2/oslo/db/sqlalchemy/migration_cli/ext_alembic.py
-oslo.db-1.0.2/oslo/db/sqlalchemy/migration_cli/ext_base.py
-oslo.db-1.0.2/oslo/db/sqlalchemy/migration_cli/ext_migrate.py
-oslo.db-1.0.2/oslo/db/sqlalchemy/migration_cli/manager.py
-oslo.db-1.0.2/oslo/db/options.py
-oslo.db-1.0.2/oslo/db/_i18n.py
-oslo.db-1.0.2/oslo/db/openstack/common/__init__.py
-oslo.db-1.0.2/doc/source/conf.py
-oslo.db-1.0.2/tests/sqlalchemy/test_handle_error.py
-oslo.db-1.0.2/tests/sqlalchemy/test_engine_connect.py
-oslo.db-1.0.2/tests/sqlalchemy/test_exc_filters.py
-oslo.db-1.0.2/tests/sqlalchemy/test_options.py
-oslo.db-1.0.2/tests/sqlalchemy/test_migrate_cli.py
-
-# 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.
-============================================================
-
-oslo.db-1.0.2/oslo/db/api.py
-
-# Copyright (c) 2013 Rackspace Hosting
-# 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.
-============================================================
-
-oslo.db-1.0.2/oslo/db/sqlalchemy/test_migrations.py
-
-# Copyright 2010-2011 OpenStack Foundation
-# Copyright 2012-2013 IBM Corp.
-# 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.
-============================================================
-oslo.db-1.0.2/oslo/db/sqlalchemy/migration.py
-
# Copyright (c) 2013 OpenStack Foundation
# All Rights Reserved.
#
@@ -296,356 +224,3 @@
# 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.
-============================================================
-
-oslo.db-1.0.2/oslo/db/sqlalchemy/models.py
-
-# Copyright (c) 2011 X.commerce, a business unit of eBay Inc.
-# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
-# Copyright 2011 Piston Cloud Computing, Inc.
-# Copyright 2012 Cloudscaling Group, Inc.
-# 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.
-============================================================
-
-oslo.db-1.0.2/oslo/db/sqlalchemy/session.py
-
-# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
-# 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.
-============================================================
-
-oslo.db-1.0.2/oslo/db/sqlalchemy/provision.py
-oslo.db-1.0.2/tests/sqlalchemy/test_migration_common.py
-
-# Copyright 2013 Mirantis.inc
-# 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.
-============================================================
-
-oslo.db-1.0.2/oslo/db/sqlalchemy/test_base.py
-
-# Copyright (c) 2013 OpenStack Foundation
-# 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.
-============================================================
-
-oslo.db-1.0.2/oslo/db/sqlalchemy/utils.py
-
-# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
-# Copyright 2010-2011 OpenStack Foundation.
-# Copyright 2012 Justin Santa Barbara
-# 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.
-============================================================
-
-oslo.db-1.0.2/oslo/db/concurrency.py
-oslo.db-1.0.2/tests/test_concurrency.py
-
-# Copyright 2014 Mirantis.inc
-# 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.
-============================================================
-
-oslo.db-1.0.2/oslo/db/exception.py
-
-# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
-# 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.
-============================================================
-
-oslo.db-1.0.2/oslo/db/openstack/common/fixture/config.py
-
-#
-# Copyright 2013 Mirantis, Inc.
-# Copyright 2013 OpenStack Foundation
-# 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.
-============================================================
-
-oslo.db-1.0.2/oslo.db/locale/en_GB/LC_MESSAGES/oslo.db.po
-oslo.db-1.0.2/oslo.db/locale/en_GB/LC_MESSAGES/oslo.db-log-critical.po
-oslo.db-1.0.2/oslo.db/locale/en_GB/LC_MESSAGES/oslo.db-log-info.po
-oslo.db-1.0.2/oslo.db/locale/en_GB/LC_MESSAGES/oslo.db-log-warning.po
-oslo.db-1.0.2/oslo.db/locale/en_GB/LC_MESSAGES/oslo.db-log-error.po
-
-# English (United Kingdom) translations for oslo.db.
-# Copyright (C) 2014 ORGANIZATION
-# This file is distributed under the same license as the oslo.db project.
-#
-# Translators:
-# Andi Chandler <[email protected]>, 2014
-============================================================
-
-oslo.db-1.0.2/oslo.db/locale/oslo.db-log-error.pot
-oslo.db-1.0.2/oslo.db/locale/oslo.db-log-info.pot
-oslo.db-1.0.2/oslo.db/locale/oslo.db-log-critical.pot
-oslo.db-1.0.2/oslo.db/locale/oslo.db-log-warning.pot
-oslo.db-1.0.2/oslo.db/locale/oslo.db.pot
-
-# Translations template for oslo.db.
-# Copyright (C) 2014 ORGANIZATION
-# This file is distributed under the same license as the oslo.db project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
-============================================================
-
-oslo.db-1.0.2/tests/utils.py
-
-# Copyright 2010-2011 OpenStack Foundation
-# 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.
-============================================================
-
-oslo.db-1.0.2/tests/test_api.py
-
-# Copyright (c) 2013 Rackspace Hosting
-# 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.
-============================================================
-
-oslo.db-1.0.2/tests/sqlalchemy/test_migrations.py
-
-# Copyright 2010-2011 OpenStack Foundation
-# Copyright 2012-2013 IBM Corp.
-# 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.
-============================================================
-
-oslo.db-1.0.2/tests/sqlalchemy/test_sqlalchemy.py
-
-# Copyright (c) 2012 Rackspace Hosting
-# 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.
-============================================================
-
-oslo.db-1.0.2/tests/sqlalchemy/test_utils.py
-
-# Copyright (c) 2013 Boris Pavlovic ([email protected]).
-# 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.
-============================================================
-
-oslo.db-1.0.2/tests/sqlalchemy/test_models.py
-
-# Copyright 2012 Cloudscaling Group, Inc.
-# 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.
-============================================================
-
-oslo.db-1.0.2/tests/base.py
-
-# Copyright 2010-2011 OpenStack Foundation
-# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
-#
-# 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.
-============================================================
-
-oslo.db-1.0.2/setup.py
-
-# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# 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.
-============================================================
-#
-# Base on code in migrate/changeset/databases/sqlite.py which is under
-# the following license:
-#
-# 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.
-============================================================
--- a/components/python/oslo.db/patches/mysql_cluster_support.patch Wed Sep 07 14:48:32 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-This patchset is for bug:
-
-23033470 - oslo.db needs a database option to support MySQL Cluster
-
-This fixes the following aspects of Oslo.db:
-1. Implementation of an oslo.db configuration parameter to specify the MySQL
- storage engine (mysql_storage_engine).
-
-This has not been committed upstream, but has been filed in launchpad:
-
-https://bugs.launchpad.net/oslo.db/+bug/1564110
-
-
---- oslo.db-1.7.2/oslo_db/options.py.orig 2016-02-17 14:56:11.276310637 -0700
-+++ oslo.db-1.7.2/oslo_db/options.py 2016-02-19 10:32:20.551188376 -0700
-@@ -50,6 +50,12 @@ database_opts = [
- 'server-set SQL mode. To use whatever SQL mode '
- 'is set by the server configuration, '
- 'set this to no value. Example: mysql_sql_mode='),
-+ cfg.StrOpt('mysql_storage_engine',
-+ default='InnoDB',
-+ help='This configures the MySQL storage engine. '
-+ 'This allows for OpenStack to support different storage engines '
-+ 'such as InnoDB, NDB, etc. For MySQL Cluster, set to NDBCLUSTER. '
-+ 'Example: mysql_storage_engine=NDBCLUSTER'),
- cfg.IntOpt('idle_timeout',
- default=3600,
- deprecated_opts=[cfg.DeprecatedOpt('sql_idle_timeout',