Permalink
Browse files

Manually merging fix into develop branch. Fixes #624.

  • Loading branch information...
1 parent d21fc68 commit e684096e7854a09ce826d9fcedb8a14de0dca7dc @garnaat garnaat committed Mar 26, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 bin/s3multiput
View
@@ -285,7 +285,7 @@ def main():
else:
upload(bucket_name, aws_access_key_id,
aws_secret_access_key, fullpath, key_name,
- reduced, debug, cb, num_cb)
+ reduced, debug, cb, num_cb, grant or 'private')
total += 1
# upload a single file
@@ -311,7 +311,7 @@ def main():
else:
upload(bucket_name, aws_access_key_id,
aws_secret_access_key, path, key_name,
- reduced, debug, cb, num_cb)
+ reduced, debug, cb, num_cb, grant or 'private')
if __name__ == "__main__":
main()

0 comments on commit e684096

Please sign in to comment.