From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 28 Sep 2015 12:16:37 +0000 (+0000)
Subject: Merge "Forbid more than one branch point in alembic dependency chains"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=f4ff2a041b17d9621d80cc613dc4b2afe1697b03;p=openstack-build%2Fneutron-build.git

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

f4ff2a041b17d9621d80cc613dc4b2afe1697b03
diff --cc neutron/db/migration/cli.py
index 914374bb9,cdd3d9093..ba77683f7
--- a/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)