lp:~gundlach/nova/controllers-in-api

Branch merges

Propose for merging

No branches dependent on this one.

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

Eric Day (community): Approve on 2010-09-23

Diff: 852 lines (+300/-148)

16 files modified

bin/nova-api (+7/-3)
bin/nova-manage (+1/-2)
doc/source/auth.rst (+0/-8)
nova/api/__init__.py (+65/-4)
nova/api/cloudpipe/__init__.py (+35/-25)
nova/api/ec2/__init__.py (+7/-3)
nova/api/ec2/apirequest.py (+1/-3)
nova/api/ec2/metadatarequesthandler.py (+73/-0)
nova/auth/manager.py (+2/-2)
nova/cloudpipe/pipelib.py (+4/-2)
nova/rpc.py (+28/-23)
nova/tests/access_unittest.py (+45/-66)
nova/tests/api/__init__.py (+26/-4)
nova/tests/api_unittest.py (+5/-0)
nova/tests/cloud_unittest.py (+0/-1)
run_tests.py (+1/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

314. By Michael Gundlach on 2010-09-23

Merge vishy's patch: admin-user-not-admin-role

313. By Michael Gundlach on 2010-09-23

Merge lp:~eday/nova/endpoint-cleanup

Merged branch lp:~eday/nova/endpoint-cleanup

312. By Michael Gundlach on 2010-09-23

Merge lp:~gundlach/nova/rbac_tests_rewrite

311. By Michael Gundlach on 2010-09-23

Merge lp:~gundlach/nova/missing_ec2_url_endpoints

310. By Michael Gundlach on 2010-09-23

Spot-fix endpoint reference

309. By Michael Gundlach on 2010-09-23

Merge lp:~soren/nova/nova-api-new-daemonize

308. By Michael Gundlach on 2010-09-23

Apply vish's patch

307. By Michael Gundlach on 2010-09-22

Soren's patch to fix part of ec2

306. By Michael Gundlach on 2010-09-21

Remove eventlet test, now that eventlet 0.9.10 has indeed been replaced by 0.9.12 per mtaylor

305. By Michael Gundlach on 2010-09-21

In desperation, I'm raising eventlet.__version__ so I can see why the trunk tests are failing.