summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIsaku Yamahata <yamahata@valinux.co.jp>2011-07-08 12:09:50 +0900
committerIsaku Yamahata <yamahata@valinux.co.jp>2011-07-08 12:09:50 +0900
commit8c8e92b2662a3ab9aa2fd71bef48d95408ebb89b (patch)
treedcff4397596a98f3c359d6f34eae8325d700f505
parenta02895b6bb353a468ce7c58e60bc2dbd152c5ec9 (diff)
downloadnova-8c8e92b2662a3ab9aa2fd71bef48d95408ebb89b.tar.gz
nova-8c8e92b2662a3ab9aa2fd71bef48d95408ebb89b.tar.xz
nova-8c8e92b2662a3ab9aa2fd71bef48d95408ebb89b.zip
sqlalchemy/migrate: resolved version conflict
-rw-r--r--nova/db/sqlalchemy/migrate_repo/versions/032_add_root_device_name.py (renamed from nova/db/sqlalchemy/migrate_repo/versions/028_add_root_device_name.py)0
1 files changed, 0 insertions, 0 deletions
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/028_add_root_device_name.py b/nova/db/sqlalchemy/migrate_repo/versions/032_add_root_device_name.py
index 6b98b9890..6b98b9890 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/028_add_root_device_name.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/032_add_root_device_name.py