migration file created2

Conflicts:
	nova/db/sqlalchemy/models.py