summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIsaku Yamahata <yamahata@valinux.co.jp>2011-06-22 12:40:06 +0900
committerIsaku Yamahata <yamahata@valinux.co.jp>2011-06-22 12:40:06 +0900
commit96fc985878cd52813aa07a4843e5928031b1501a (patch)
treefb6ea260044fbbf02bedc5cbf94705061f082a7c
parent6cb927111f07dffdadb9dbcd5852961ab9db222d (diff)
db/migration: resolve version conflict
-rw-r--r--nova/db/sqlalchemy/migrate_repo/versions/027_add_root_device_name.py (renamed from nova/db/sqlalchemy/migrate_repo/versions/025_add_root_device_name.py)0
1 files changed, 0 insertions, 0 deletions
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/025_add_root_device_name.py b/nova/db/sqlalchemy/migrate_repo/versions/027_add_root_device_name.py
index 6b98b9890..6b98b9890 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/025_add_root_device_name.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/027_add_root_device_name.py