← Back to branch summary

~mcgrue/nova/volume-cleanup

~mcgrue/nova/volume-cleanup

Viewing all changes in revision 1484.

Committer: Ben McGraw
Date: 2011-08-23 22:39:22 UTC
mfrom: (1348.6.14 volume-cleanup)
Revision ID: ben@pistoncloud.com-20110823223922-lswh5xepoouyoooy

resolving conflicts.

files added:
nova/db/sqlalchemy/migrate_repo/versions/042_kill_export_devices.py

files modified:
Authors

bin/nova-manage

doc/source/runnova/getting.started.rst

nova/db/api.py

nova/db/sqlalchemy/api.py

nova/db/sqlalchemy/migration.py

nova/db/sqlalchemy/models.py

nova/exception.py

nova/tests/fake_flags.py

nova/tests/integrated/test_volumes.py

nova/tests/test_volume.py

nova/volume/driver.py

nova/volume/manager.py

nova/volume/san.py

Show diffs side-by-side

added added

removed removed

bin/nova-manage

doc/source/runnova/getting.started.rst

nova/db/sqlalchemy/api.py

nova/db/sqlalchemy/migrate_repo/versions/042_kill_export_devices.py

nova/db/sqlalchemy/migration.py

nova/db/sqlalchemy/models.py

nova/exception.py

nova/tests/fake_flags.py

nova/tests/integrated/test_volumes.py

nova/tests/test_volume.py

nova/volume/driver.py

nova/volume/manager.py

nova/volume/san.py

Older »