Merge lp://staging/~franciscosouza/txaws/txaws-bundled-vpc into lp://staging/txaws
Proposed by
Francisco Souza
| Status: | Merged |
|---|---|
| Merged at revision: | 153 |
| Proposed branch: | lp://staging/~franciscosouza/txaws/txaws-bundled-vpc |
| Merge into: | lp://staging/txaws |
| Diff against target: |
945 lines (+354/-95) 9 files modified
txaws/client/base.py (+24/-9) txaws/client/discover/tests/test_command.py (+8/-8) txaws/ec2/client.py (+55/-19) txaws/ec2/model.py (+2/-1) txaws/ec2/tests/test_client.py (+217/-35) txaws/ec2/tests/test_model.py (+6/-4) txaws/server/tests/test_call.py (+1/-1) txaws/testing/payload.py (+40/-17) txaws/version.py (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~franciscosouza/txaws/txaws-bundled-vpc |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| txAWS Committers | Pending | ||
|
Review via email:
|
|||
Description of the change
client, ec2: bundling changes needed for VPC
I use this CL for patching only, original CL's are:
https:/
https:/
https:/
https:/
This one also includes a change in parsing of instance sets.
To post a comment you must log in.
Revision history for this message
| Chico (franciscossouza) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Reviewers: mp+135397_
Message:
Please take a look.
Description:
client, ec2: bundling changes needed for VPC
I use this CL for patching only, original CL's are:
https:/
https:/
https:/
https:/
This one also includes a change in parsing of instance sets.
https:/
(do not edit description out of merge proposal)
Please review this at https:/
Affected files:
A [revision details]
M txaws/client/
M txaws/client/
M txaws/ec2/client.py
M txaws/ec2/model.py
M txaws/ec2/
M txaws/ec2/
M txaws/server/
M txaws/testing/
M txaws/version.py