lp:~soren/nova/ec2-security-groups

Branch merges

Propose for merging

No branches dependent on this one.

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

Michael Gundlach (community): Approve on 2010-10-11

Jay Pipes (community): Approve on 2010-10-08

Diff: 1687 lines (+1134/-43)

20 files modified

nova/api/ec2/__init__.py (+2/-0)
nova/api/ec2/cloud.py (+225/-11)
nova/auth/manager.py (+2/-0)
nova/compute/manager.py (+5/-0)
nova/db/api.py (+70/-0)
nova/db/sqlalchemy/api.py (+186/-2)
nova/db/sqlalchemy/models.py (+60/-4)
nova/db/sqlalchemy/session.py (+5/-4)
nova/exception.py (+3/-0)
nova/network/manager.py (+0/-1)
nova/process.py (+1/-1)
nova/test.py (+2/-0)
nova/tests/api_unittest.py (+185/-3)
nova/tests/objectstore_unittest.py (+1/-1)
nova/tests/virt_unittest.py (+172/-12)
nova/virt/interfaces.template (+0/-1)
nova/virt/libvirt.qemu.xml.template (+4/-0)
nova/virt/libvirt.uml.xml.template (+4/-0)
nova/virt/libvirt_conn.py (+206/-3)
run_tests.py (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

321. By Soren Hansen on 2010-10-12

Merge trunk (that's 10 times now, count 'em\!)

320. By Soren Hansen on 2010-10-12

Merge trunk.

319. By Soren Hansen on 2010-10-12

Remove spurious project_id addition to KeyPair model.

318. By Soren Hansen on 2010-10-12

APIRequestContext.admin is no more..

317. By Soren Hansen on 2010-10-12

Merge trunk.

316. By Soren Hansen on 2010-10-05

Merge trunk.

315. By Soren Hansen on 2010-10-04

Merge security group related changes from lp:~anso/nova/deploy

314. By Soren Hansen on 2010-10-04

Merge trunk

313. By Soren Hansen on 2010-10-01

Merge trunk

312. By Soren Hansen on 2010-10-01

Merge lp:~anso/nova/ec2-security-groups

Merged branch lp:~anso/nova/ec2-security-groups