Merge staged changes

This commit is contained in:
Steve Langasek 2023-05-30 10:00:57 -07:00
commit 83158d24d9
2 changed files with 9 additions and 1 deletions

9
debian/changelog vendored
View File

@ -1,3 +1,12 @@
ubuntu-dev-tools (0.193ubuntu4) UNRELEASED; urgency=medium
* Remove references to ftpmaster.internal. When this name is resolvable
but firewalled, syncpackage hangs; and these are tools for developers,
not for running in an automated context in the DCs where
ftpmaster.internal is reachable.
-- Steve Langasek <steve.langasek@ubuntu.com> Wed, 12 Apr 2023 17:57:35 -0700
ubuntu-dev-tools (0.193ubuntu3) mantic; urgency=medium
* Excise all references to cdbs (including in test cases)

View File

@ -44,7 +44,6 @@ class UDTConfig:
"MIRROR_FALLBACK": True,
"UBUNTU_MIRROR": "http://archive.ubuntu.com/ubuntu",
"UBUNTU_PORTS_MIRROR": "http://ports.ubuntu.com",
"UBUNTU_INTERNAL_MIRROR": "http://ftpmaster.internal/ubuntu",
"UBUNTU_DDEBS_MIRROR": "http://ddebs.ubuntu.com",
"UPDATE_BUILDER": False,
"WORKDIR": None,