lp://staging/~ed-leafe/nova/lp708309

Branch merges

Propose for merging

No branches dependent on this one.

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

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

Vish Ishaya (community): Approve on 2011-01-27

Diff: 148 lines (+106/-5)

4 files modified

nova/service.py (+3/-2)
nova/tests/test_localization.py (+100/-0)
nova/utils.py (+2/-2)
nova/virt/xenapi/vm_utils.py (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #708309: New localized strings with >1 placeholder still being added to trunk not using dict formating

Low

Fix Released

Link a bug report

Related blueprints

630. By Ed Leafe on 2011-01-27

Made changes based on code review

629. By Ed Leafe on 2011-01-27

Merged in trunk changes

628. By Ed Leafe on 2011-01-27

Fixed formatting issues in current codebase.

627. By Ed Leafe on 2011-01-27

Added the test for localized string formatting

626. By Hisaharu Ishii on 2011-01-27

Fix Bug #703037. ra_server is None

625. By Todd Willey on 2011-01-27

Fix regression in s3 image service. This should be a feature freeze exception.

624. By Dan Prince on 2011-01-26

Fixes a stupid mistake I made when I moved this method from a module into a class.

Thanks Dan for spotting it.

623. By Sandy Walsh on 2011-01-26

Simple little changes related to openstack api to work better with glance.

Fixes ImageID missing from Glance and int->string id problem.

622. By Sandy Walsh on 2011-01-26

Simple little changes related to openstack api to work better with glance.

Fixes ImageID missing from Glance and int->string id problem.

621. By Todd Willey on 2011-01-26

Add DescribeInstanceTypes to admin api. This lets the dashboard know what sizes can be launched (using the -t flag in euca-run-instances, for example) and what resources they provide.