Ignore:
Timestamp:
Sep 26, 2010, 3:24:23 PM (14 years ago)
Author:
ezyang
Message:
Merge changes from trunk.
Location:
branches/fc13-dev
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/fc13-dev

  • branches/fc13-dev/server/fedora/config/etc/hosts

    r1674 r1675  
    101018.181.0.229    scripts-test.mit.edu scripts-test
    1111
     1218.181.0.57     better-mousetrap.mit.edu better-mousetrap scripts1.mit.edu scripts1
    121318.181.0.53     old-faithful.mit.edu old-faithful scripts2.mit.edu scripts2
    13 18.181.0.57     better-mousetrap.mit.edu better-mousetrap scripts1.mit.edu scripts1
    141418.181.0.167    bees-knees.mit.edu bees-knees sx-blade-4.mit.edu sx-blade-4 scripts3.mit.edu scripts3
    151518.181.0.228    cats-whiskers.mit.edu cats-whiskers scripts4.mit.edu scripts4
     1618.181.0.236    whole-enchilada.mit.edu whole-enchilada scripts5.mit.edu scripts5
    161718.181.0.237    pancake-bunny.mit.edu pancake-bunny scripts6.mit.edu scripts6
    171818.181.0.234    busy-beaver.mit.edu busy-beaver scripts7.mit.edu scripts7
    181918.181.0.235    real-mccoy.mit.edu real-mccoy scripts8.mit.edu scripts8
    1920
     21172.21.0.57     better-mousetrap.mit.edu
    2022172.21.0.53     old-faithful.mit.edu
    21 172.21.0.57     better-mousetrap.mit.edu
    2223172.21.0.167    bees-knees.mit.edu
    2324172.21.0.228    cats-whiskers.mit.edu
     25172.21.0.236    whole-enchilada.mit.edu
    2426172.21.0.237    pancake-bunny.mit.edu
    2527172.21.0.234    busy-beaver.mit.edu
Note: See TracChangeset for help on using the changeset viewer.