Changeset 1674 for branches/fc13-dev/server/fedora/config/etc/hosts

Timestamp:

Sep 26, 2010, 3:23:31 PM (14 years ago)

Author:

ezyang

Message:

Undo merge.

Location:

branches/fc13-dev

Files:

• . (modified) (1 prop)
• server/fedora/config/etc/hosts (modified) (1 diff)

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

@@ -10 +10 @@
 18.181.0.229    scripts-test.mit.edu scripts-test
 
+18.181.0.53     old-faithful.mit.edu old-faithful scripts2.mit.edu scripts2
 18.181.0.57     better-mousetrap.mit.edu better-mousetrap scripts1.mit.edu scripts1
-18.181.0.53     old-faithful.mit.edu old-faithful scripts2.mit.edu scripts2
 18.181.0.167    bees-knees.mit.edu bees-knees sx-blade-4.mit.edu sx-blade-4 scripts3.mit.edu scripts3
 18.181.0.228    cats-whiskers.mit.edu cats-whiskers scripts4.mit.edu scripts4
-18.181.0.236    whole-enchilada.mit.edu whole-enchilada scripts5.mit.edu scripts5
 18.181.0.237    pancake-bunny.mit.edu pancake-bunny scripts6.mit.edu scripts6
 18.181.0.234    busy-beaver.mit.edu busy-beaver scripts7.mit.edu scripts7
 18.181.0.235    real-mccoy.mit.edu real-mccoy scripts8.mit.edu scripts8
 
+172.21.0.53     old-faithful.mit.edu
 172.21.0.57     better-mousetrap.mit.edu
-172.21.0.53     old-faithful.mit.edu
 172.21.0.167    bees-knees.mit.edu
 172.21.0.228    cats-whiskers.mit.edu
-172.21.0.236    whole-enchilada.mit.edu
 172.21.0.237    pancake-bunny.mit.edu
 172.21.0.234    busy-beaver.mit.edu