OpenStack Compute (nova)

Merge lp://staging/~ed-leafe/nova/lp703041 into lp://staging/~hudson-openstack/nova/trunk

  1. lp703041
  2. Merge into trunk
Proposed by Ed Leafe
Status: Merged
Approved by: Soren Hansen
Approved revision: 581
Merged at revision: 607
Proposed branch: lp://staging/~ed-leafe/nova/lp703041
Merge into: lp://staging/~hudson-openstack/nova/trunk
Diff against target: 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)
To merge this branch: bzr merge lp://staging/~ed-leafe/nova/lp703041
Reviewer Review Type Date Requested Status
Thierry Carrez (community) Approve
Jay Pipes (community) Approve
Review via email: mp+46823@code.staging.launchpad.net

Description of the change

Localized strings that employ formatting should not use positional arguments, as they prevent the translator from re-ordering the translated text; instead, they should use mappings (i.e., dicts). This change replaces all localized formatted strings that use more than one formatting placeholder with a mapping version.

To post a comment you must log in.
Revision history for this message
Jay Pipes (jaypipes) wrote :

lgtm

review: Approve
Revision history for this message
Thierry Carrez (ttx) wrote :

L195: you want %(controller)s, not %(contorller)s

review: Needs Fixing
Revision history for this message
Ed Leafe (ed-leafe) wrote :

Thierry: good catch. Fixed and pushed.

Revision history for this message
Thierry Carrez (ttx) wrote :

lgtm

review: Approve
Revision history for this message
OpenStack Infra (hudson-openstack) wrote :
Download full text (21.0 KiB)

The attempt to merge lp:~ed-leafe/nova/lp703041 into lp:nova failed. Below is the output from the failed tests.

AdminAPITest
    test_admin_disabled ok
    test_admin_enabled ok
APITest
    test_exceptions_are_converted_to_faults ok
Test
    test_authorize_token ok
    test_authorize_user ok
    test_bad_token ok
    test_bad_user ok
    test_no_user ok
    test_token_expiry ok
TestLimiter
    test_authorize_token ok
TestFaults
    test_fault_parts ok
    test_raise ok
    test_retry_header ok
FlavorsTest
    test_get_flavor_by_id ok
    test_get_flavor_list ok
GlanceImageServiceTest
    test_create ok
    test_create_and_show_non_existing_image ok
    test_delete ok
    test_update ok
ImageControllerWithGlanceServiceTest
    test_get_image_details ok
    test_get_image_index ok
LocalImageServiceTest
    test_create ok
    test_create_and_show_non_existing_image ok
    test_delete ok
    test_update ok
LimiterTest
    test_minute ok
    test_one_per_period ok
    test_second ok
    test_users_get_separate_buckets ok
    test_we_can_go_indefinitely_if_we_spread_out_requests ok
WSGIAppProxyTest
    test_200 ok
    test_403 ok
    test_failure ok
WSGIAppTest
    test_escaping ok
    test_good_urls ok
    test_invalid_methods ok
    test_invalid_urls ok
    test_response_to_delays ok
ServersTest
    test_create_backup_schedules ok
    test_create_instance ok
    test_delete_backup_schedules ok
    test_delete_server_instance ok
    test_get_all_server_details ok
    test_g...

lp://staging/~ed-leafe/nova/lp703041 updated
581. By Ed Leafe

Removed tabs form source. Merged trunk changes

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.