summaryrefslogtreecommitdiffstats
path: root/nova/exception.py
diff options
context:
space:
mode:
authorRick Harris <rconradharris@gmail.com>2011-06-02 14:08:19 -0500
committerRick Harris <rconradharris@gmail.com>2011-06-02 14:08:19 -0500
commit82e56f5c6e1e0e2a0ac3d48705a1acfd39a1aeab (patch)
tree8440cc717219ed8165fa30604db5ce3e711d3fc9 /nova/exception.py
parent6f22642e792e9c861c23266672f8d939cd9dd060 (diff)
parent8b6de21b5ed4248998eef7deb57b1bc4f3863276 (diff)
downloadnova-82e56f5c6e1e0e2a0ac3d48705a1acfd39a1aeab.tar.gz
nova-82e56f5c6e1e0e2a0ac3d48705a1acfd39a1aeab.tar.xz
nova-82e56f5c6e1e0e2a0ac3d48705a1acfd39a1aeab.zip
Fixing conflicts
Diffstat (limited to 'nova/exception.py')
0 files changed, 0 insertions, 0 deletions