diff options
| author | jaypipes@gmail.com <> | 2011-03-14 13:59:41 -0400 |
|---|---|---|
| committer | jaypipes@gmail.com <> | 2011-03-14 13:59:41 -0400 |
| commit | 8cf9e2320b0d7f4c79d910cbac1f5a0db9aa999c (patch) | |
| tree | 6cb64437aec944e7210cd7a6d5a2db9723971ec8 /nova/exception.py | |
| parent | 0dcd68077183c6cce60075a35be36f5c0764925b (diff) | |
| parent | 7fde254ec53aeb88301e5592853961b2b9c87ef4 (diff) | |
| download | nova-8cf9e2320b0d7f4c79d910cbac1f5a0db9aa999c.tar.gz nova-8cf9e2320b0d7f4c79d910cbac1f5a0db9aa999c.tar.xz nova-8cf9e2320b0d7f4c79d910cbac1f5a0db9aa999c.zip | |
Merge trunk, resolve conflicts, and rename 010_ migrate file to 011_ since another migrate file got into trunk ahead of this...
Diffstat (limited to 'nova/exception.py')
0 files changed, 0 insertions, 0 deletions