Merge lp://staging/~tribaal/ubuntu/utopic/ubumirror/1341523-upstream-release into lp://staging/ubuntu/utopic/ubumirror
Proposed by
Chris Glass
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merge reported by: | Chris Glass | ||||
| Merged at revision: | not available | ||||
| Proposed branch: | lp://staging/~tribaal/ubuntu/utopic/ubumirror/1341523-upstream-release | ||||
| Merge into: | lp://staging/ubuntu/utopic/ubumirror | ||||
| Diff against target: |
338 lines (+143/-72) 11 files modified
AUTHORS (+1/-0) apache2-ubuntu-mirror.conf (+54/-0) debian/changelog (+14/-0) debian/control (+3/-4) debian/ubumirror.examples (+1/-0) ubuarchive (+4/-2) ubucdimage (+17/-23) ubumirror.conf (+33/-37) ubumirror.crontab (+11/-4) ubuports (+2/-1) uburelease (+3/-1) |
||||
| To merge this branch: | bzr merge lp://staging/~tribaal/ubuntu/utopic/ubumirror/1341523-upstream-release | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel Holbach | Approve | ||
|
Review via email:
|
|||
Description of the change
This branch pulls the code from the upstream 0.4 release into Ubuntu (see https:/
Notable changes are:
* Added an apache2 example config file.
* Fixed crontab example.
* Added a timeout configuration option.
* Normalized the behavior of the cdimage script. It now behaves like the
other scripts.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks. Uploaded.
I merely changed the version number to be 0.4.