← Back to branch summary

~anso/nova/factorycleanup

~anso/nova/factorycleanup

« back to all changes in this revision

Viewing changes to nova/exception.py

Committer: Todd Willey
Date: 2011-01-17 18:51:00 UTC
mfrom: (524.1.12 wsgirouter)
Revision ID: todd@ansolabs.com-20110117185100-d38jerwbg8wzeg4k

Merge trunk

files added:
bin/nova-direct-api

bin/stack

contrib/boto_v6

contrib/boto_v6/__init__.py

contrib/boto_v6/ec2

contrib/boto_v6/ec2/__init__.py

contrib/boto_v6/ec2/connection.py

contrib/boto_v6/ec2/instance.py

nova/api/direct.py

nova/tests/test_direct.py

plugins/xenserver/xenapi/etc/xapi.d/plugins/agent

run_tests.py

smoketests/public_network_smoketests.py

files removed:
run_tests.py

files renamed:
nova/compute/disk.py => nova/virt/disk.py

files modified:
Authors

bin/nova-manage

contrib/nova.sh

nova/api/ec2/cloud.py

nova/api/openstack/servers.py

nova/compute/api.py

nova/compute/manager.py

nova/db/api.py

nova/db/sqlalchemy/api.py

nova/db/sqlalchemy/models.py

nova/exception.py

nova/network/linux_net.py

nova/network/manager.py

nova/test.py

nova/tests/api/openstack/__init__.py

nova/tests/test_api.py

nova/tests/test_cloud.py

nova/tests/test_compute.py

nova/tests/test_console.py

nova/tests/test_log.py

nova/tests/test_middleware.py

nova/tests/test_network.py

nova/tests/test_twistd.py

nova/tests/test_xenapi.py

nova/utils.py

nova/virt/fake.py

nova/virt/libvirt.xml.template

nova/virt/libvirt_conn.py

nova/virt/xenapi/vmops.py

nova/virt/xenapi_conn.py

nova/volume/driver.py

nova/wsgi.py

smoketests/admin_smoketests.py

smoketests/base.py

smoketests/flags.py

smoketests/user_smoketests.py

tools/pip-requires

Show diffs side-by-side

added added

removed removed

nova/exception.py

76

76

pass

77

77

78

78

79

class TimeoutException(Error):

80

pass

81

82

79

83

def wrap_exception(f):

80

84

def _wrap(*args, **kw):

81

85

try:

Older »