summaryrefslogtreecommitdiffstats
path: root/nova/exception.py
diff options
context:
space:
mode:
authorBrian Waldon <brian.waldon@rackspace.com>2011-02-15 15:01:41 -0500
committerBrian Waldon <brian.waldon@rackspace.com>2011-02-15 15:01:41 -0500
commit8074ecf9f8e8d4e24909e2255e40da4c5fa9ce9e (patch)
treea7f13616e6d7cd393b717e7c59766d43b9a07c8c /nova/exception.py
parent4a4a3f04b78ba2cbaa0d02ecf0f7cd3cf580901b (diff)
parent273e6703a9e4f7e3b7810f204ffb6bb0f86602bd (diff)
downloadnova-8074ecf9f8e8d4e24909e2255e40da4c5fa9ce9e.tar.gz
nova-8074ecf9f8e8d4e24909e2255e40da4c5fa9ce9e.tar.xz
nova-8074ecf9f8e8d4e24909e2255e40da4c5fa9ce9e.zip
merging trunk back in; updating Authors conflict
Diffstat (limited to 'nova/exception.py')
0 files changed, 0 insertions, 0 deletions