[S3tools-bugs] new mdomsch/merge branch - lots of pull requests merged

[Matt D. <ma...@do...>]

The pull requests have been piling up for several months, with lots of
bugs being fixed by 21 different developers.  Michal hasn't had time
to review, test, and merge these, so here's my attempt to help the
process along, in hope of getting more people to test and report success/failure.

Appended is the shortlog of all changes pulled into my merge branch since
the current upstream-master 9ee3bdd320c8.  I've also tried leaving a
comment on each of the existing pull requests.  There were a few I
think need a little more work before they can be merged, or that
require Michal's judgment.

The tree: https://github.com/mdomsch/s3cmd/tree/merge
  (HEAD commit ae6030cd33d4)
ZIP archive: https://github.com/mdomsch/s3cmd/archive/merge.zip
Clone:   git clone git://github.com/mdomsch/s3cmd.git
  (you want the branch called 'merge')

If this works for you, please leave a comment.  If you were
particuarly affected by a bug that is now fixed, _please_ let us know
that as well.

Special thanks to Will Tinsdeall (@ivebeenlinuxed) for reviewing and
merging six of these patches into his tree for testing this last month.

Thanks,
Matt Domsch (@mdomsch)



Shortlog:

Brandon Galbraith (1):
      Update s3cmd.1

Dale Lovelace (1):
      Allow --acl-grant on AWS groups e.g.

Emmanuel (1):
      managed files that was not remote copy to upload them directly

Eric Drechsel (1):
      Fix for ignored --default-mime-type option

Eugene Brevdo (4):
      Added --continue-put and --upload-id, allowing skipping of files or     part files during upload when their size and md5sum match the file     being uploaded.
      Minor bugfix to --upload-id check
      Fixed a small bug in MultiPart upload
      Fixed a upload corruption bug in MultiPart continue.

George Melika (1):
      Added a --disable-content-encoding to disable adding the content-encoding header to the pushed objects

Haruka Iwao (1):
      S3/Config.py       Get user input aws access key, secret and gpg passphrase out of debug format string

Jose Fernandez (magec) (2):
      Make use of TMP variable to change tempdir
      Document Environment variables

Kevin Daub (4):
      Added --server-side-encryption as an option and adds the header to put and put-copy.
      Reverted out manpage update
      Added Server-Side Encryption (SSE) to output of --info
      Fixed formatting

Leandro Ostera (1):
      Update s3cmd --configure

Matt Domsch (21):
      don't purge the HashCache if using --files-from
      HashCache: catch KeyError in unmark_for_purge(), bug #194
      HashCache and FileDict: ignore files with device = 0 or inode = 0
      Merge branch 'files-from' into merge
      Merge branch 'bug/194' into merge
      fixup merge
      Merge remote-tracking branch 'ivebeenlinuxed/master' into merge
      Merge remote-tracking branch 'reed-sandberg/master' into merge
      Merge remote-tracking branch 'kuenishi/more_multipart' into merge
      Merge remote-tracking branch 'scharissis/fix_help_typo' into merge
      finish merge of #186
      Merge remote-tracking branch 'orenhe/simplify_wildcard_handling' into merge
      Merge remote-tracking branch 'robysath/master' into merge
      Merge remote-tracking branch 'spartman/remote-copy-fix' into merge
      remote_copy(): fix value in failed_copy_list
      Merge branch 'no-mime-magic-option' of git://github.com/radomirml/s3cmd into merge
      Merge branch 'master' of git://github.com/brandongalbraith/s3cmd into merge
      Merge branch 'listallmybuckets-error' of git://github.com/leostera/s3cmd into merge
      Fix for ignored --default-mime-type option
      Merge branch 'bug/default-mime-type' into merge
      really merge @edrex https://github.com/s3tools/s3cmd/pull/244

Oren Held (1):
      Slightly simplify wildcard handling

Reed Sandberg (1):
      Objects may exist on S3 with empty names (''), which don't map so well     to common filesystems. Save them locally as '__AWS-EMPTY-OBJECT-NAME__'.

Robinson Sathaseevan (2):
      Fixed pyflakes-undefined-name errors.
      Fixed spelling and usage of bare hyphen.

Ryan Braganza (1):
      Fix typos in s3cmd --help

Stefano Charissis (1):
      Fix: typo in help message for '--configure'

UENISHI Kota (7):
      add list multiparts and abort multipart
      add list multiparts and abort multipart
      add listmp
      merge master
      debug message
      Merge pull request #3 from ebrevdo/more_multipart
      Merge pull request #5 from ebrevdo/more_multipart

Will Tinsdeall (7):
      Merge remote-tracking branch 'mdomsch/bug/227'
      Merge remote-tracking branch 'dalelovelace/master'
      Merge remote-tracking branch 'yuryu/master'
      Merge remote-tracking branch 'seneque/master'
      De-geekify help file for --disable-content-encoding
      Merge commit 'b1c48fe97b4ae1212c57bbf598fc124e3a2d668f' (gmelika/master)
      Merge remote-tracking branch 'magec/feature/override_tmp_dir'

gmelika (1):
      Update Config.py

macgyver13 (1):
      Update FileLists.py

radomir (1):
      Added option --no-mime-magic to disable mime magic, bug #198

seneque (2):
      preserve ownership when synchronizing from s3 to local
      preserve ownership when synchronizing from s3 to local