Merge lp:~cjwatson/livecd-rootfs/drop-lp-hostname-filtering

This commit is contained in:
Steve Langasek 2018-07-03 08:12:49 -07:00
commit a72bfb8a07
2 changed files with 6 additions and 1 deletions

5
debian/changelog vendored
View File

@ -1,7 +1,12 @@
livecd-rootfs (2.533) UNRELEASED; urgency=medium
[ Robert C Jennings ]
* ubuntu-cpc: Remove git-man for minimized images
[ Colin Watson ]
* live-build/auto/config: Drop "lp-*" hostname filter for Launchpad
builders, since LP #1747015 is now fixed; "*.buildd" should be enough.
-- Robert C Jennings <robert.jennings@canonical.com> Fri, 08 Jun 2018 10:10:53 -0700
livecd-rootfs (2.532) cosmic; urgency=medium

View File

@ -17,7 +17,7 @@ if [ -z "$MIRROR" ]; then
*.ubuntu.com) MIRROR=http://ftpmaster.internal/ubuntu/
SEEDMIRROR=http://archive-team.internal/seeds/
;;
*.buildd|lp-*) MIRROR=http://ftpmaster.internal/ubuntu/
*.buildd) MIRROR=http://ftpmaster.internal/ubuntu/
SEEDMIRROR=http://archive-team.internal/seeds/
;;
*.ppa|*.scalingstack) MIRROR=http://ftpmaster.internal/ubuntu/