← Back to team overview

duplicity-team team mailing list archive

[Merge] lp:~michal-s/duplicity/0.8-series into lp:duplicity

 

Michal Smereczynski has proposed merging lp:~michal-s/duplicity/0.8-series into lp:duplicity.

Requested reviews:
  duplicity-team (duplicity-team)

For more details, see:
https://code.launchpad.net/~michal-s/duplicity/0.8-series/+merge/275910

Due to changes in Microsoft Azure Python SDK the names and origin of two classes has changed and duplicity is not usable with Azure backend. The first one is WindowsAzureMissingResourceError and the second one is WindowsAzureConflictError. Both changes described here: https://github.com/Azure/azure-sdk-for-python/blob/bc1e1e767465ae365a59470058cd2913e3e6cb8f/ChangeLog.txt
-- 
Your team duplicity-team is requested to review the proposed merge of lp:~michal-s/duplicity/0.8-series into lp:duplicity.
=== modified file 'CHANGELOG'
--- CHANGELOG	2015-10-27 17:34:05 +0000
+++ CHANGELOG	2015-10-27 19:11:23 +0000
@@ -119,6 +119,9 @@
 * Merged in lp:~ed.so/duplicity/gpg.binary
   - new parameter --gpg-binary allows user to point to a different gpg binary,
     not necessarily in path
+* Merged in lp:~ed.so/duplicity/gpg.binary
+  - new parameter --gpg-binary allows user to point to a different gpg binary,
+    not necessarily in path
 * Merged in lp:~aaron-whitehouse/duplicity/fix_POTFILES.in_and_run-tests
   - Fixed two filename references in po/POTFILES.in, a mistake which crept in in
     rev 1093 and caused testing/run-tests to fail with "IndexError: list index