Ignore:
Timestamp:
May 22, 2012, 10:52:35 PM (12 years ago)
Author:
ezyang
Message:
Merge changes from trunk.
Location:
branches/fc17-dev
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • branches/fc17-dev

  • branches/fc17-dev/server/fedora/config/etc/mock/scripts-fc11-i386.cfg

    r1889 r2195  
    2525name=updates
    2626#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f11&arch=i386
    27 baseurl=http://download3.fedora.redhat.com/pub/fedora/linux/updates/11/i386/
     27baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/11/i386/
    2828failovermethod=priority
    2929

  • branches/fc17-dev/server/fedora/config/etc/mock/scripts-fc11-x86_64.cfg

    r1889 r2195  
    2929name=updates
    3030#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f11&arch=x86_64
    31 baseurl=http://download3.fedora.redhat.com/pub/fedora/linux/updates/11/x86_64/
     31baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/11/x86_64/
    3232failovermethod=priority
    3333

  • branches/fc17-dev/server/fedora/config/etc/mock/scripts-fc13-i386.cfg

    r1889 r2195  
    2424[updates-released]
    2525name=updates
    26 baseurl=http://download3.fedora.redhat.com/pub/fedora/linux/updates/13/i386/
     26baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/13/i386/
    2727failovermethod=priority
    2828
    … …  
    3636name=Scripts
    3737baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc13/
    38 enabled=0
     38enabled=1
    3939gpgcheck=0
    4040""" # end config_opts['yum.conf']

  • branches/fc17-dev/server/fedora/config/etc/mock/scripts-fc13-x86_64.cfg

    r1889 r2195  
    2929name=updates
    3030#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f13&arch=x86_64
    31 baseurl=http://download3.fedora.redhat.com/pub/fedora/linux/updates/13/x86_64/
     31baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/13/x86_64/
    3232failovermethod=priority
    3333
    3434[updates-testing]
    3535name=updates-testing
    36 baseurl=http://download3.fedora.redhat.com/pub/fedora/linux/updates/testing/13/x86_64/
     36baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/testing/13/x86_64/
    3737failovermethod=priority
    3838enabled=0

  • branches/fc17-dev/server/fedora/config/etc/mock/scripts-fc15-i386.cfg

    r2066 r2195  
    2828name=updates
    2929#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f15&arch=i386
    30 baseurl=http://download3.fedora.redhat.com/pub/fedora/linux/updates/15/i386/
     30baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/15/i386/
    3131failovermethod=priority
    3232
    … …  
    4040name=Scripts
    4141baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc15/
    42 enabled=0
     42enabled=1
    4343gpgcheck=0
    4444"""

  • branches/fc17-dev/server/fedora/config/etc/mock/scripts-fc15-x86_64.cfg

    r2066 r2195  
    3232name=updates
    3333#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f15&arch=x86_64
    34 baseurl=http://download3.fedora.redhat.com/pub/fedora/linux/updates/15/x86_64/
     34baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/15/x86_64/
    3535failovermethod=priority
    3636
    … …  
    4444name=Scripts
    4545baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc15/
    46 enabled=0
     46enabled=1
    4747gpgcheck=0
    4848"""
Note: See TracChangeset for help on using the changeset viewer.