Merge "Forbid more than one branch point in alembic dependency chains"

diff --cc neutron/db/migration/cli.py
index 914374bb927c0a110c5aeccce0f9bcff533e51e0,cdd3d909373f84f61a420830a4db266e5805df19..ba77683f7abea9e01420198ac90f63a6b773326c
--- 1/neutron/db/migration/cli.py
--- 2/neutron/db/migration/cli.py
+++ b/neutron/db/migration/cli.py
@@@ -116,14 -116,9 +116,14 @@@ def _get_alembic_entrypoint(project)
      return migration_entrypoints[project]
  
  
 +def do_generic_show(config, cmd):
 +    kwargs = {'verbose': CONF.command.verbose}
 +    do_alembic_command(config, cmd, **kwargs)
 +
 +
  def do_check_migration(config, cmd):
      do_alembic_command(config, 'branches')
-     validate_labels(config)
+     validate_revisions(config)
      validate_heads_file(config)
  
  

diff --cc neutron/tests/unit/db/test_migration.py
Simple merge