In hopes of getting my pull requests merged, as well as the pending backlog of pull requests, I went ahead and created a tree that has (nearly) all the pull requests in it now. Of the 22 open requests, the only one I haven't pulled is firstclown's Pickle encryption request, because it wasn't clear from the comments that it's in shape enough to consider pulling.
https://github.com/mdomsch/s3cmd/tree/merge (aka the 'merge' branch on my tree at git://github.com/mdomsch/s3cmd.git) I had to make a few minor manual cleanups, but I think they were straightforward. Shortlog appended from s3tools/s3cmd.git master to top of my 'merge' branch. I did a few operations to be sure it still ran, and it seems to work as expected. Thanks, Matt -- Matt Domsch Technology Strategist Dell | Office of the CTO Brendan O'Connor (1): Bugfix: use extra headers -- allows Requester Pays for buckets you don't own. Patch from http://arxiv.org/help/bulk_data_s3 Charlie Schluting (2): s3cmd du can gobble gigs of RAM on a bucket with millions of objects. Re-worked 'du' to traverse the structure and store only the sum at each level, allowing python to free memory at each folder. Went from 4GB consumption (and being killed) on a test bucket with ~50M objects in thousands of directories, to a max of 80M usage. that's not necessary any more. Eric Connell (1): added the ability to upload files by reading from stdin George Hickman (2): Don't include python files in the manifest. Add a makefile for releasing James Brown (1): Respect the $TZ environment variable to show local times if requested Jason Godfrey (1): Quick fix for cfcreate and cf modify not working. These commands would generate a KeyError for 'Origin'. (Bug 3536626) Joe Fiorini (1): Added command to set bucket access policy Josep del Rio (4): When using default index, invalidate path Corrected the new flags for CF index invalidation Removed debug messages, make sure default index is defined Fixed exception for root document Karl Matthias (1): Add support for putting arbitrary additional headers in s3cfg file. Karsten Sperling (13): Added example /etc/magic file with better support for web file types Add support for setting Content-Encoding header where it can be guessed, in particular Content-Encoding: gzip is handled. Flush stdout after logging messages, in case buffered pipes are involved Merge branch 'master' of git://github.com/s3tools/s3cmd Added example /etc/magic file with better support for web file types Add support for setting Content-Encoding header where it can be guessed, in particular Content-Encoding: gzip is handled. Flush stdout after logging messages, in case buffered pipes are involved Fix up code that was merged incorrectly Merge branch 'mime-guessing' Add -M short option for --guess-mime-type Fix ValueError when magic module is not present Add support for http://pypi.python.org/pypi/filemagic version of python-magic Merge branch 'mime-guessing' Matt Domsch (48): Apply excludes/includes at local os.walk() time add --delete-after option for sync add more --delete-after to sync variations Merge remote-tracking branch 'origin/master' into merge Merge branch 'delete-after' into merge add Config.delete_after Merge branch 'delete-after' into merge fix os.walk() exclusions for new upstream code Merge branch 'master' into merge add --delay-updates option finish merge Handle hardlinks and duplicate files hardlink/copy fix remote_copy() doesn't need to know dst_list anymore handle remote->local transfers with local hardlink/copy if possible sync: add --add-destination, parallelize uploads to multiple destinations add local tree MD5 caching fix getting uid Apply excludes/includes at local os.walk() time add --delete-after option for sync add more --delete-after to sync variations add Config.delete_after fix os.walk() exclusions for new upstream code add --delay-updates option Handle hardlinks and duplicate files hardlink/copy fix remote_copy() doesn't need to know dst_list anymore handle remote->local transfers with local hardlink/copy if possible sync: add --add-destination, parallelize uploads to multiple destinations add local tree MD5 caching fix getting uid HashCache: add missing break during purge merge manpage conflict] Merge branch 'cache-local-md5' into hardlink-fixes sync: refactor parent/child and single process code Merge branch 'econnell/master' into econnell-merge merge relistan/master Merge remote-tracking branch 'brendano/master' into brendano-merge Merge remote-tracking branch 'ksperling/master' into ksperling-merge Merge remote-tracking branch 'michaeltyson/master' into michaeltyson-merge Merge remote-tracking branch 'joseprio/master' into joseprio-merge Merge remote-tracking branch 'ghickman/packaging' into ghickman-merge Merge remote-tracking branch 'mattswe/patch-1' into mattswe-merge Merge remote-tracking branch 'joefiorini/access-policy' into joefiorini-merge Merge remote-tracking branch 'Roguelazer/tz_support' into Roguelazer-merge Merge remote-tracking branch 'godfreja/fix_cf_keyerror' into godfreja-merge Merge remote-tracking branch 'manos/master' into manos-merge Merge remote-tracking branch 'ghickman/manifest-cleanup' into merge Matt Sweeney (1): Add command line options for AWS access key and secret key Michael Tyson (1): Added support for --acl-grant/--acl-revoke to 'sync' command Tom Wilkie (1): Fix inline if so that it works on python2.4 econnell (1): Merge pull request #1 from tomwilkie/master ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ S3tools-general mailing list S3tools-general@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/s3tools-general
