← Back to branch summary

~ubuntu-branches/ubuntu/trusty/heat/trusty-proposed

« back to all changes in this revision

Viewing changes to heat/db/sqlalchemy/migrate_repo/versions/033_software_config.py

  • Committer: Package Import Robot
  • Author(s): Corey Bryant
  • Date: 2015-06-22 10:14:10 UTC
  • mfrom: (1.1.18)
  • Revision ID: package-import@ubuntu.com-20150622101410-ieac2skyy7nhfw18
Tags: 2014.1.5-0ubuntu1
https://launchpad.net/bugs/1467533
* Resynchronize with stable/icehouse (314437f) (LP: #1467533):
  - [eb22b01] Fix cloud-init Python syntax for Python < 2.6
  - [314437f] Patch 033 migration to work w/ MySQL 5.6
* d/p/fix-requirements.patch: Rebased

Show diffs side-by-side

added added

removed removed

Lines of Context:
heat/db/sqlalchemy/migrate_repo/versions/033_software_config.py
33
33
        sqlalchemy.Column('group', sqlalchemy.String(255)),
34
34
        sqlalchemy.Column('config', LongText),
35
35
        sqlalchemy.Column('io', Json),
36
 
        sqlalchemy.Column('tenant', sqlalchemy.String(256),
 
36
        sqlalchemy.Column('tenant', sqlalchemy.String(64),
37
37
                          nullable=False,
38
38
                          index=True),
39
39
        mysql_engine='InnoDB',
62
62
        sqlalchemy.Column('action', sqlalchemy.String(255)),
63
63
        sqlalchemy.Column('status', sqlalchemy.String(255)),
64
64
        sqlalchemy.Column('status_reason', sqlalchemy.String(255)),
65
 
        sqlalchemy.Column('tenant', sqlalchemy.String(256),
 
65
        sqlalchemy.Column('tenant', sqlalchemy.String(64),
66
66
                          nullable=False,
67
67
                          index=True),
68
68
        mysql_engine='InnoDB',