-
Committer:
Bazaar Package Importer
-
Author(s):
Stefano Rivera
-
Date:
2011-08-10 17:44:50 UTC
-
mfrom:
(2.1.21 sid)
-
Revision ID:
james.westby@ubuntu.com-20110810174450-mx6quijzn67guo6q
Tags: 1:2.9ubuntu1
* Merge from debian unstable. Remaining changes:
- debian/{control,rules}: Add quilt for patch management.
- Debian bug 455082:
+ default-settings.patch: change rsync defaults.
+ silence-errors.patch: throw away find errors.
+ drop-redundant-rsync.patch: clean up logic in rsync batching.
+ check_file-return.patch: report why a file needs to sync.
- Debian bug 576576:
+ skip-installer.patch: allow specific releases to be skipped.
- Debian bug 576577:
+ rsync-retries.patch: retry if rsync batch fails connection.
- ubuntu-settings.patch: Changed defaults to download Ubuntu, replaced
most instances of Debian with Ubuntu in the documentation.