Merge lp://qastaging/~termie/nova/clean_ec2 into lp://qastaging/~hudson-openstack/nova/trunk
Proposed by
termie
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://qastaging/~termie/nova/clean_ec2 |
| Merge into: | lp://qastaging/~hudson-openstack/nova/trunk |
| Diff against target: |
1093 lines (+817/-25) (has conflicts) 7 files modified
nova/api/ec2/apirequest.py (+21/-1) nova/api/ec2/cloud.py (+486/-24) nova/api/ec2/metadatarequesthandler.py (+4/-0) nova/clean.py (+118/-0) nova/tests/clean_unittest.py (+56/-0) nova/tests/test_auth.py (+9/-0) run_tests.py.OTHER (+123/-0) Text conflict in nova/api/ec2/cloud.py Text conflict in nova/api/ec2/metadatarequesthandler.py Text conflict in nova/tests/test_auth.py Contents conflict in run_tests.py |
| To merge this branch: | bzr merge lp://qastaging/~termie/nova/clean_ec2 |
| Related bugs: | |
| Related blueprints: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Eric Day (community) | Needs Fixing | ||
|
Review via email:
|
|||
Description of the change
Starts down the path of API validation for the ec2 api.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
This thing is a mess, lots of conflicts, and even has a set of conflict files checked back in. :) Merge with trunk first?