Merge lp:~dkeeney/txaws/add-multipart-upload into lp:txaws
Status: | Needs review | ||||
---|---|---|---|---|---|
Proposed branch: | lp:~dkeeney/txaws/add-multipart-upload | ||||
Merge into: | lp:txaws | ||||
Diff against target: |
589 lines (+467/-5) (has conflicts) 8 files modified
bin/txaws-delete-upload (+45/-0) bin/txaws-list-uploads (+40/-0) bin/txaws-post-upload (+86/-0) bin/txaws-put-object (+1/-1) txaws/client/base.py (+6/-0) txaws/s3/client.py (+205/-4) txaws/s3/multipart.py (+81/-0) txaws/script.py (+3/-0) Text conflict in txaws/client/base.py Text conflict in txaws/s3/client.py |
||||
To merge this branch: | bzr merge lp:~dkeeney/txaws/add-multipart-upload | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Zooko Wilcox-O'Hearn | Needs Fixing | ||
Review via email:
|
Description of the change
Okay, I read the patches on this branch: lp:~dkeeney/txaws/add-multipart-upload . The only problem I noticed is that the most recent changes -- http://
Unmerged revisions
- 79. By David Keeney <email address hidden>
-
raise exception on no page from finish
- 78. By David Keeney <email address hidden>
-
refine upload finish handling
- 77. By David Keeney <email address hidden>
-
response reading added to multipart finish
- 76. By Eugene Oden
-
added a get_object_stream() method to the s3 client
- 75. By Eugene Oden
-
modified txaws-post-upload to avoid reading files into memory
minor documentation fix for txaws/script.py - 74. By David Keeney <email address hidden>
-
removed transitional crap
- 73. By David Keeney <email address hidden>
-
removed transitional crap
- 72. By Eugene Oden
-
mark the new scripts as executable
- 71. By Eugene Oden
-
the rest of david's changes
- 70. By Eugene Oden
-
merging david's changes with the latest trunk
Oh, and also a lack of tests for all of the other changes in the branch. I would favor adding tests before merging, actually, so I guess I should now undo my "suggest merge" action?