Merge lp://staging/~thomnico/orange-box/mirror into lp://staging/~cpe-sa/orange-box/staging
Proposed by
Nicolas Thomas
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~thomnico/orange-box/mirror |
| Merge into: | lp://staging/~cpe-sa/orange-box/staging |
| Diff against target: |
879 lines (+584/-57) (has conflicts) 26 files modified
debian/changelog (+22/-0) debian/control (+10/-2) debian/postinst (+8/-0) debian/postrm (+2/-2) debian/preinst (+13/-1) etc/apache2/sites-available/archive.conf (+0/-13) etc/apache2/sites-available/archive.ubuntu.com.conf (+14/-0) etc/apache2/sites-available/cdimage.ubuntu.com.conf (+14/-0) etc/apache2/sites-available/cloud-images.ubuntu.com.conf (+14/-0) etc/apache2/sites-available/ports.ubuntu.com.conf (+14/-0) etc/apache2/sites-available/releases.ubuntu.com.conf (+14/-0) etc/apache2/sites-available/ubuntu-cloud.archive.canonical.com.conf (+12/-0) etc/apache2/sites-available/ubuntu-cloud.conf (+0/-12) etc/apt/orange-box-mirror.list (+43/-20) etc/bind/named.conf.wildcard-archive (+6/-0) etc/bind/zones.wildcard-archive (+20/-0) etc/cron.d/charmstore-mirror (+0/-4) etc/cron.d/orange-box-mirror (+0/-1) etc/debconf-selections (+0/-2) etc/orangebox-mirror.state (+1/-0) etc/ucloudexclude.list (+26/-0) usr/bin/orange-box-mirror (+236/-0) usr/bin/orange-box-resetproxy (+34/-0) usr/lib/orange-box/templates/mirror-bind/named.conf.template (+6/-0) usr/lib/orange-box/templates/mirror-bind/zones.template (+17/-0) usr/lib/orange-box/templates/ubumirror.conf (+58/-0) Text conflict in debian/changelog Text conflict in debian/control Text conflict in debian/postinst Text conflict in debian/preinst |
| To merge this branch: | bzr merge lp://staging/~thomnico/orange-box/mirror |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| CPE SA | Pending | ||
|
Review via email:
|
|||
Description of the change
Mirror feature based on 2.9 code proposed as a merge to test the feature
To post a comment you must log in.
Unmerged revisions
- 551. By Nicolas Thomas
-
* Fix lftp destination dir
* remove deps on biosdevname to not confuse new guys - 550. By Nicolas Thomas
-
Fix a few bugs on the destination of files
- 549. By Nicolas Thomas
-
Rebranch on staging cpe-sa
- 548. By Nicolas Thomas
-
* Enable local mirroring
* Reduce the number of dns redirects
* remove dep on ubumirror and do a faster sync to cloud-images
* use lftp instead of apt-mirror for cloud-archive
[ Nicolas Thomas ]
* Adding support for mirror
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
