From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 2 Oct 2015 20:15:02 +0000 (+0000)
Subject: Merge "Deprecate branchless migration chains from neutron-db-manage"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=82866276b0cf7a10cbb9f5e92a12680b096a3770;p=openstack-build%2Fneutron-build.git

Merge "Deprecate branchless migration chains from neutron-db-manage"
---

82866276b0cf7a10cbb9f5e92a12680b096a3770
diff --cc neutron/db/migration/cli.py
index e58c00518,5f775fc04..d2edc9d54
--- a/neutron/db/migration/cli.py
+++ b/neutron/db/migration/cli.py
@@@ -24,9 -24,9 +24,10 @@@ from oslo_config import cf
  from oslo_utils import fileutils
  from oslo_utils import importutils
  import pkg_resources
+ import six
  
  from neutron.common import utils
 +from neutron.db import migration
  
  
  HEAD_FILENAME = 'HEAD'