lp:~termie/nova/eventlet_merge

Branch merges

Propose for merging

No branches dependent on this one.

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

Jay Pipes (community): Approve on 2010-12-15

Eric Day (community): Approve on 2010-12-15

Anthony Young (community): Needs Fixing on 2010-12-11

Diff: 4171 lines (+651/-1472)

45 files modified

bin/nova-api (+8/-12)
bin/nova-combined (+65/-0)
bin/nova-compute (+6/-9)
bin/nova-network (+6/-9)
bin/nova-scheduler (+6/-9)
bin/nova-volume (+6/-9)
nova/compute/disk.py (+39/-45)
nova/compute/manager.py (+20/-29)
nova/flags.py (+7/-0)
nova/manager.py (+1/-3)
nova/network/manager.py (+1/-3)
nova/objectstore/image.py (+1/-0)
nova/process.py (+0/-209)
nova/rpc.py (+26/-57)
nova/server.py (+0/-151)
nova/service.py (+0/-195)
nova/test.py (+85/-15)
nova/tests/access_unittest.py (+1/-1)
nova/tests/auth_unittest.py (+3/-3)
nova/tests/cloud_unittest.py (+2/-4)
nova/tests/compute_unittest.py (+18/-23)
nova/tests/flags_unittest.py (+1/-1)
nova/tests/misc_unittest.py (+1/-1)
nova/tests/network_unittest.py (+1/-1)
nova/tests/objectstore_unittest.py (+2/-2)
nova/tests/process_unittest.py (+0/-132)
nova/tests/quota_unittest.py (+1/-1)
nova/tests/rpc_unittest.py (+18/-18)
nova/tests/scheduler_unittest.py (+12/-12)
nova/tests/service_unittest.py (+14/-32)
nova/tests/validator_unittest.py (+0/-42)
nova/tests/virt_unittest.py (+5/-6)
nova/tests/volume_unittest.py (+25/-33)
nova/utils.py (+43/-13)
nova/validate.py (+0/-94)
nova/virt/fake.py (+3/-7)
nova/virt/images.py (+6/-5)
nova/virt/libvirt_conn.py (+80/-99)
nova/virt/xenapi/network_utils.py (+3/-7)
nova/virt/xenapi/vm_utils.py (+10/-20)
nova/virt/xenapi/vmops.py (+30/-37)
nova/virt/xenapi_conn.py (+23/-24)
nova/volume/driver.py (+57/-79)
nova/volume/manager.py (+11/-16)
run_tests.py (+4/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

400. By termie on 2010-12-16

pep8 fixes for bin

399. By termie on 2010-12-16

pep8 fixes

398. By termie on 2010-12-15

fixes for xenapi (thanks sandywalsh)

397. By termie on 2010-12-15

merged from upstream

396. By termie on 2010-12-15

add missing import

395. By termie on 2010-12-15

merged upstream

394. By termie on 2010-12-15

updates per review

393. By termie on 2010-12-10

port new patches

392. By termie on 2010-12-10

merge-a-tat-tat upstream to this branch

391. By termie on 2010-12-10

add back utils.default_flagflie