I've built a new merge branch to test out a series of pull requests that have accumulated in the last few weeks. Feel free to pull mdomsch/merge from github and give it a try to see if it solves your problems, and doesn't introduce new ones. Comments on the pull requests or bugs at github are always appreciated, both "works for me, thanks!" and "you broke something with this".Here's the shortlog of items on my merge branch. The tree passes the internal test suite.
AJP (1):Fix printing error in `report_exception(e)`Anton I. Sipos (1):Fix crash when cloudfront operations receive 500 errors. Retries parameter was not being sent to send_request as a keyword arg.Børge Nerdal Kjelsrud (1):Add option to ignore error on copy when key no longer existsCastedo Ellerman (1):content_encoding != charset, bug #153Dave Cole (1):Apply include/exclude to destinations too, via mdomsch/s3cmd@268e7c3bd37cf60920025d556449fc1b93a1c590 Refs s3tools/s3cmd#109.Jason Dalton (1):Relaxed timeout for http connection during IAM role lookupMatt Domsch (15):add --files-from=FILE to allow transfer of select files onlyaccept --files-from=- to read from stdinadd --files-from to manpageuse --files-from only on local source (not remote, not dest)add --max-delete for del and sync commands, fixes bug #155sync: ignore --delete-removed if no source files, bug #155Merge branch 'files-from' into merge, pull request #116Merge remote-tracking branch 'borgenk/master' into merge, PR #143Merge remote-tracking branch 'yar/master' into merge, PR #147Merge remote-tracking branch 'aisipos/master' into merge, PR #151Merge remote-tracking branch 'developmentseed/master' into merge, PR #152Merge branch 'bug/155' into merge, PR #156Merge branch 'bug/153' into merge, PR #157Merge remote-tracking branch 'abuchanan-grio/master' into merge, PR #162Merge remote-tracking branch 'tjasond/master' into merge, PR #163Yar Dmitriev (1):fixing the order of public URL componentsThanks,Matt