← Back to branch summary

~mterry/duplicity/drop-pexpect

« back to all changes in this revision

Viewing changes to duplicity/globals.py

  • Committer: Kenneth Loafman
  • Date: 2014-04-17 17:10:34 UTC
  • mfrom: (967.1.2 duplicity)
  • Revision ID: kenneth@loafman.com-20140417171034-s6x53o1g57to3q7n
* Merged in lp:~fredrik-loch/duplicity/duplicity-S3-SSE
  - Adds support for server side encryption as requested in Bug #996660

Show diffs side-by-side

added added

removed removed

Lines of Context:
duplicity/globals.py
206
206
# Maximum time to wait for a part to finish when doig a multipart upload to S3
207
207
s3_multipart_max_timeout = None
208
208
 
 
209
# Use server side encryption in s3
 
210
s3_use_sse = False
 
211
 
209
212
# Whether to use the full email address as the user name when
210
213
# logging into an imap server. If false just the user name
211
214
# part of the email address is used.