Changeset 2066 for trunk/server/fedora/config/etc/hosts

Timestamp:

Nov 22, 2011, 12:45:17 AM (13 years ago)

Author:

achernya

Message:

Merge branches/fc15-dev to trunk

Location:

trunk

Files:

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

trunk/server/fedora/config/etc/hosts

@@ -18 +18 @@
 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
-18.181.0.135    shining-armor.mit.edu shining-armor # scripts9.mit.edu scripts9
+18.181.0.135    shining-armor.mit.edu shining-armor scripts9.mit.edu scripts9
+18.181.0.141    golden-egg.mit.edu golden-egg scripts10.mit.edu scripts10
 
 172.21.0.57     better-mousetrap.mit.edu
@@ -29 +30 @@
 172.21.0.235    real-mccoy.mit.edu
 172.21.0.135    shining-armor.mit.edu
+172.21.0.141    golden-egg.mit.edu