diff options
author | Josh Kearney <josh@jk0.org> | 2011-03-01 10:55:13 -0600 |
---|---|---|
committer | Josh Kearney <josh@jk0.org> | 2011-03-01 10:55:13 -0600 |
commit | fbcbf5ef805748bea29e4135ee8989830064c273 (patch) | |
tree | dcf908b2360fd29f761a1c4d7ee6db84029834cd /nova/exception.py | |
parent | a95402f5d6c25df83c49d5293917e4c553fd01e7 (diff) | |
download | nova-fbcbf5ef805748bea29e4135ee8989830064c273.tar.gz nova-fbcbf5ef805748bea29e4135ee8989830064c273.tar.xz nova-fbcbf5ef805748bea29e4135ee8989830064c273.zip |
Fixed trunk merge issues
Diffstat (limited to 'nova/exception.py')
0 files changed, 0 insertions, 0 deletions