From a261c7ef41a7ec80fec730b53b1b51011870c6d7 Mon Sep 17 00:00:00 2001 From: Thierry Carrez Date: Wed, 23 Mar 2016 10:52:07 +0100 Subject: [PATCH 1/2] Update .gitreview for stable/mitaka Change-Id: Ie9545ba6a1e6ee086e1144ff1ecfce72749d8edf --- .gitreview | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitreview b/.gitreview index 955af452f..0cdb4d471 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,4 @@ host=review.openstack.org port=29418 project=openstack/barbican.git +defaultbranch=stable/mitaka From acbdb030430df2af7d0e884ea7a2851e99b42944 Mon Sep 17 00:00:00 2001 From: Christopher Solis Date: Fri, 25 Mar 2016 11:44:36 -0500 Subject: [PATCH 2/2] Change Table name to correct name The table name is currently wrong in this version and needs to be changed to the correct name. It is preventing the database migration script from running correctly. Closes-Bug: #1562091 Change-Id: I9be88a4385ab58b37be5842aaaefd8353a2f6f76 (cherry picked from commit 2ecc676dd2521c727eb1d720bac6c2533f8337d9) --- .../versions/d2780d5aa510_change_url_length.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/barbican/model/migration/alembic_migrations/versions/d2780d5aa510_change_url_length.py b/barbican/model/migration/alembic_migrations/versions/d2780d5aa510_change_url_length.py index 25f72200c..e6678ff34 100644 --- a/barbican/model/migration/alembic_migrations/versions/d2780d5aa510_change_url_length.py +++ b/barbican/model/migration/alembic_migrations/versions/d2780d5aa510_change_url_length.py @@ -16,7 +16,7 @@ import sqlalchemy as sa def upgrade(): op.alter_column( - 'ContainerConsumerMetadatum', + 'container_consumer_metadata', 'URL', type_=sa.String(length=255) )