magnum cnm patch testing

gistfile1.txt

# The patches should be applied in the following order:
$ git log --oneline
a315e30 WIP: Refactors Heat templates for Container Networking Model
0fa3419 WIP: Adds labels support
abf2718 WIP: Adds Combined Support for Container Network Model
4eac317 Merge "Fix the hard-coded etcd cluster size"

# Note ptch 0fa3419 & abf2718 modify the revision history
# In order for the patches to work properly, you need to modify:
# magnum/db/sqlalchemy/alembic/versions/1481f5b560dd_add_labels_column_to_baymodel_table.py
# Change down_revision # to match the revision # of the of the abf2718 patch.

# Note: I run $magnum-db-manage upgrade after patch abf2718 and do the same after patch 0fa3419
$ git diff -w
diff --git a/magnum/db/sqlalchemy/alembic/versions/1481f5b560dd_add_labels_column_to_baymodel_table.py b/magnum/db/sqlalchemy/alembic/versi
index 33fa2d1..681393d 100644
--- a/magnum/db/sqlalchemy/alembic/versions/1481f5b560dd_add_labels_column_to_baymodel_table.py
+++ b/magnum/db/sqlalchemy/alembic/versions/1481f5b560dd_add_labels_column_to_baymodel_table.py
@@ -12,14 +12,14 @@
 """add labels column to baymodel table
 
 Revision ID: 1481f5b560dd
-Revises: 6f21dc920bb
+Revises: 3be65537a94a
 Create Date: 2015-09-02 22:34:07.590142
 
 """
 
 # revision identifiers, used by Alembic.
 revision = '1481f5b560dd'
-down_revision = '6f21dc920bb'
+down_revision = '3be65537a94a'
 
 from alembic import op
 import sqlalchemy as sa