cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2015-04-21 12:52:22 -04:00
parent 9a18f58087 07be883258
commit 0fc926934a
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -7,6 +7,8 @@ propellor (2.2.2) UNRELEASED; urgency=medium
* Note that since a new switch had to be added to allow testing the binary, * Note that since a new switch had to be added to allow testing the binary,
upgrading to this version will cause a rebuild from scratch of propellor. upgrading to this version will cause a rebuild from scratch of propellor.
* Added hasLoginShell and shellEnabled. * Added hasLoginShell and shellEnabled.
* debCdn changed to new httpredir.debian.org official replacement for
http.debian.net.
-- Joey Hess <id@joeyh.name> Thu, 02 Apr 2015 10:09:46 -0400 -- Joey Hess <id@joeyh.name> Thu, 02 Apr 2015 10:09:46 -0400

2
src/Propellor/Property/Apt.hs
View File

@ -61,7 +61,7 @@ binandsrc url suite = catMaybes
return $ debLine bs url stdSections return $ debLine bs url stdSections
debCdn :: SourcesGenerator debCdn :: SourcesGenerator
debCdn = binandsrc "http://http.debian.net/debian" debCdn = binandsrc "http://httpredir.debian.org/debian"
kernelOrg :: SourcesGenerator kernelOrg :: SourcesGenerator
kernelOrg = binandsrc "http://mirrors.kernel.org/debian" kernelOrg = binandsrc "http://mirrors.kernel.org/debian"