lp:~ed-leafe/nova/xs-password-reset

Branch merges

Propose for merging

No branches dependent on this one.

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

Sandy Walsh (community): Approve on 2011-01-13

Soren Hansen (community): Approve on 2011-01-13

Trey Morris (community): Approve on 2011-01-11

Eric Day (community): Approve on 2011-01-08

Diff: 811 lines (+431/-117)

10 files modified

nova/api/openstack/servers.py (+6/-3)
nova/compute/api.py (+31/-84)
nova/compute/manager.py (+33/-0)
nova/exception.py (+4/-0)
nova/tests/test_compute.py (+7/-0)
nova/tests/test_xenapi.py (+27/-0)
nova/virt/fake.py (+17/-4)
nova/virt/xenapi/vmops.py (+174/-25)
nova/virt/xenapi_conn.py (+6/-1)
plugins/xenserver/xenapi/etc/xapi.d/plugins/agent (+126/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #739788: virt.xenapi.vmops.py -> get_info should only accept a vm opaque reference

Medium

Fix Released

Link a bug report

Related blueprints

515. By Ed Leafe on 2011-01-13

Minor code cleanups

514. By Ed Leafe on 2011-01-13

Minor code cleanups

513. By Ed Leafe on 2011-01-13

Minor code cleanups

512. By Ed Leafe on 2011-01-13

Added unit tests for the Diffie-Hellman class. Merged recent trunk changes

511. By Ed Leafe on 2011-01-13

Replaced home-grown Diffie-Hellman implementation with the M2Crypto version supplied by Soren

510. By Ed Leafe on 2011-01-12

merged changes from trunk

509. By Ed Leafe on 2011-01-12

cleaned up prior merge mess

508. By Ed Leafe on 2011-01-11

merged trunk changes

507. By Ed Leafe on 2011-01-11

Removed unneeded SimpleDH code from agent plugin. Improved handling of plugin call failures.

506. By Ed Leafe on 2011-01-10

merged trunk changes