summaryrefslogtreecommitdiffstats
path: root/nova/exception.py
diff options
context:
space:
mode:
authormatt.dietz@rackspace.com <>2011-03-08 23:45:19 +0000
committerTarmac <>2011-03-08 23:45:19 +0000
commita02c0db7cd72aa3d716116c87cab98b243b5b618 (patch)
tree460c660eb4ef22a120843879a5bfb7da0758f90b /nova/exception.py
parentca3314b82aa47fe54386d1169481836c07ae8913 (diff)
parent698398fdc2a05a0930591d3f3d386ad24a322359 (diff)
downloadnova-a02c0db7cd72aa3d716116c87cab98b243b5b618.tar.gz
nova-a02c0db7cd72aa3d716116c87cab98b243b5b618.tar.xz
nova-a02c0db7cd72aa3d716116c87cab98b243b5b618.zip
Fixes lp730960 - mangled instance creation in virt drivers due to improper merge conflict resolution
Diffstat (limited to 'nova/exception.py')
0 files changed, 0 insertions, 0 deletions