lp:~citrix-openstack/nova/xenapi-vlan-network-manager

Branch merges

Propose for merging

No branches dependent on this one.

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

termie (community): Needs Fixing on 2011-03-28

Trey Morris (community): Approve on 2011-03-28

Thierry Carrez (community): Approve (ffe) on 2011-03-25

Matt Dietz (community): Approve on 2011-03-23

Diff: 1378 lines (+429/-226)

9 files modified

nova/network/linux_net.py (+0/-3)
nova/network/manager.py (+2/-0)
nova/network/xenapi_net.py (+85/-0)
nova/tests/db/fakes.py (+44/-21)
nova/tests/fake_utils.py (+10/-7)
nova/tests/test_xenapi.py (+54/-45)
nova/virt/xenapi/fake.py (+107/-65)
nova/virt/xenapi/network_utils.py (+17/-2)
nova/virt/xenapi/vmops.py (+110/-83)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

705. By Armando Migliaccio on 2011-03-29

sorted pep8 errors that were introduced during previous fixes

704. By Armando Migliaccio on 2011-03-29

merge trunk

703. By Armando Migliaccio on 2011-03-28

fix docstrings

702. By Armando Migliaccio on 2011-03-28

merge trunk

701. By Armando Migliaccio on 2011-03-28

style fixes

700. By Armando Migliaccio on 2011-03-28

merge trunk

699. By Armando Migliaccio on 2011-03-28

merge trunk

698. By Armando Migliaccio on 2011-03-28

addressed termies review (third round)

697. By Armando Migliaccio on 2011-03-28

addressed termie's review (second round)

696. By Armando Migliaccio on 2011-03-28

addressed termies review (first round)