lp:~ed-leafe/nova/lp703041

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~hudson-openstack/nova/trunk at revision 607

Thierry Carrez (community): Approve on 2011-01-21

Jay Pipes (community): Approve on 2011-01-21

Diff: 1614 lines (+340/-281)

35 files modified

bin/nova-api (+1/-1)
bin/nova-dhcpbridge (+3/-3)
doc/ext/nova_todo.py (+3/-2)
nova/api/ec2/__init__.py (+12/-8)
nova/api/ec2/admin.py (+23/-16)
nova/api/ec2/apirequest.py (+4/-2)
nova/api/ec2/cloud.py (+8/-6)
nova/api/openstack/servers.py (+3/-3)
nova/auth/ldapdriver.py (+2/-2)
nova/auth/manager.py (+42/-27)
nova/compute/api.py (+7/-4)
nova/compute/manager.py (+17/-15)
nova/compute/monitor.py (+6/-4)
nova/db/sqlalchemy/api.py (+13/-19)
nova/exception.py (+3/-2)
nova/fakerabbit.py (+6/-5)
nova/network/manager.py (+6/-4)
nova/objectstore/handler.py (+22/-21)
nova/rpc.py (+10/-9)
nova/scheduler/manager.py (+1/-1)
nova/service.py (+2/-2)
nova/tests/test_rpc.py (+2/-1)
nova/utils.py (+5/-3)
nova/virt/hyperv.py (+46/-39)
nova/virt/images.py (+1/-1)
nova/virt/libvirt_conn.py (+14/-12)
nova/virt/xenapi/fake.py (+5/-2)
nova/virt/xenapi/vm_utils.py (+33/-27)
nova/virt/xenapi/vmops.py (+5/-2)
nova/virt/xenapi/volume_utils.py (+9/-9)
nova/virt/xenapi/volumeops.py (+12/-13)
nova/virt/xenapi_conn.py (+4/-9)
nova/volume/api.py (+4/-3)
nova/volume/manager.py (+4/-3)
nova/wsgi.py (+2/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #703041: i18n strings with >1 placeholder should always use dictionary, not tuple, replacement

Low

Fix Released

Link a bug report

Related blueprints

581. By Ed Leafe on 2011-01-24

Removed tabs form source. Merged trunk changes

580. By Ed Leafe on 2011-01-21

Resolved trunk merge conflicts

579. By Ed Leafe on 2011-01-21

fixed typo

578. By Ed Leafe on 2011-01-19

Updated trunk changes to work with localization

577. By Ed Leafe on 2011-01-19

Removed unneeded line

576. By Ed Leafe on 2011-01-19

merged trunk changes

575. By Ed Leafe on 2011-01-19

minor code cleanup

574. By Ed Leafe on 2011-01-19

minor code cleanup

573. By Ed Leafe on 2011-01-19

Completed first pass at converting all localized strings with multiple format substitutions.

572. By Todd Willey on 2011-01-17

Change where paste.deploy factories live and how they are called. They are now in the nova.wsgi.Application/Middleware classes, and call the __init__ method of their class with kwargs of the local configuration of the paste file.