old_contents: # vim: tabstop=4 shiftwidth=4 softtabstop=4
  #
  # Copyright 2013 OpenStack Foundation
  #
  #    Licensed under the Apache License, Version 2.0 (the "License"); you may
  #    not use this file except in compliance with the License. You may obtain
  #    a copy of the License at
  #
  #         http://www.apache.org/licenses/LICENSE-2.0
  #
  #    Unless required by applicable law or agreed to in writing, software
  #    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
  #    License for the specific language governing permissions and limitations
  #    under the License.
  #
  
  """Add cisco_provider_networks table
  
  Revision ID: e6b16a30d97
  Revises: 2032abe8edac
  Create Date: 2013-07-18 21:46:12.792504
  
  """
  
  # revision identifiers, used by Alembic.
  revision = 'e6b16a30d97'
  down_revision = '2032abe8edac'
  
  # Change to ['*'] if this migration applies to all plugins
  
  migration_for_plugins = [
      'neutron.plugins.cisco.network_plugin.PluginV2'
  ]
  
  from alembic import op
  import sqlalchemy as sa
  
  
  from neutron.db import migration
  
  
  def upgrade(active_plugin=None, options=None):
      if not migration.should_run(active_plugin, migration_for_plugins):
          return
  
      op.create_table(
          'cisco_provider_networks',
          sa.Column('network_id', sa.String(length=36), nullable=False),
          sa.Column('network_type', sa.String(length=255), nullable=False),
          sa.Column('segmentation_id', sa.Integer(), nullable=False),
          sa.PrimaryKeyConstraint('network_id')
      )
  
  
  def downgrade(active_plugin=None, options=None):
      if not migration.should_run(active_plugin, migration_for_plugins):
          return
  
      op.drop_table('cisco_provider_networks')
  
new_contents: # vim: tabstop=4 shiftwidth=4 softtabstop=4
  #
  # Copyright 2013 OpenStack Foundation
  #
  #    Licensed under the Apache License, Version 2.0 (the "License"); you may
  #    not use this file except in compliance with the License. You may obtain
  #    a copy of the License at
  #
  #         http://www.apache.org/licenses/LICENSE-2.0
  #
  #    Unless required by applicable law or agreed to in writing, software
  #    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
  #    License for the specific language governing permissions and limitations
  #    under the License.
  #
  
  """Add cisco_provider_networks table
  
  Revision ID: e6b16a30d97
  Revises: 557edfc53098
  Create Date: 2013-07-18 21:46:12.792504
  
  """
  
  # revision identifiers, used by Alembic.
  revision = 'e6b16a30d97'
  down_revision = '557edfc53098'
  
  # Change to ['*'] if this migration applies to all plugins
  
  migration_for_plugins = [
      'neutron.plugins.cisco.network_plugin.PluginV2'
  ]
  
  from alembic import op
  import sqlalchemy as sa
  
  
  from neutron.db import migration
  
  
  def upgrade(active_plugin=None, options=None):
      if not migration.should_run(active_plugin, migration_for_plugins):
          return
  
      op.create_table(
          'cisco_provider_networks',
          sa.Column('network_id', sa.String(length=36), nullable=False),
          sa.Column('network_type', sa.String(length=255), nullable=False),
          sa.Column('segmentation_id', sa.Integer(), nullable=False),
          sa.PrimaryKeyConstraint('network_id')
      )
  
  
  def downgrade(active_plugin=None, options=None):
      if not migration.should_run(active_plugin, migration_for_plugins):
          return
  
      op.drop_table('cisco_provider_networks')
  
subject: Fix migration branch appeared after recent commit