diff options
| author | Isaku Yamahata <yamahata@valinux.co.jp> | 2011-06-16 21:44:50 +0900 |
|---|---|---|
| committer | Isaku Yamahata <yamahata@valinux.co.jp> | 2011-06-16 21:44:50 +0900 |
| commit | 8da93c0352996ec733f3678b9ca02b72a96498c2 (patch) | |
| tree | bba10a3e19f39dec66fa5713e6a22df527d021b1 | |
| parent | 46c7e018ee3aed0f0e27ae3544193adb5fa62958 (diff) | |
fix conflict with rebasing.
| -rw-r--r-- | nova/db/sqlalchemy/migrate_repo/versions/025_add_root_device_name.py (renamed from nova/db/sqlalchemy/migrate_repo/versions/022_add_root_device_name.py) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/022_add_root_device_name.py b/nova/db/sqlalchemy/migrate_repo/versions/025_add_root_device_name.py index 6b98b9890..6b98b9890 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/022_add_root_device_name.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/025_add_root_device_name.py |