diff options
author | Justin Santa Barbara <justin@fathomdb.com> | 2011-03-07 14:34:02 -0800 |
---|---|---|
committer | Justin Santa Barbara <justin@fathomdb.com> | 2011-03-07 14:34:02 -0800 |
commit | f65867673eff81d649d1a43e895dfae913d83e84 (patch) | |
tree | a2fc1cd9dd8ac424fd8c014f093d8ef63bc9b406 /nova/exception.py | |
parent | 861a7f2b53f02af2ef196411171182394edd7e17 (diff) | |
parent | 421cab431253290445608c67c14ec736c3bd2708 (diff) | |
download | nova-f65867673eff81d649d1a43e895dfae913d83e84.tar.gz nova-f65867673eff81d649d1a43e895dfae913d83e84.tar.xz nova-f65867673eff81d649d1a43e895dfae913d83e84.zip |
Merge with trunk, resolve conflicts and refactor
Diffstat (limited to 'nova/exception.py')
0 files changed, 0 insertions, 0 deletions