Changeset 1684 for trunk

Timestamp:

Sep 28, 2010, 3:36:13 PM (14 years ago)

Author:

ezyang

Message:

Merge in shining-armor.

Location:

trunk/server/fedora/config/etc

Files:

• . (modified) (1 prop)
• hosts (modified) (2 diffs)
• sysconfig/network-scripts/route-eth1 (modified) (1 diff)

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
 
 172.21.0.57     better-mousetrap.mit.edu
@@ -27 +28 @@
 172.21.0.234    busy-beaver.mit.edu
 172.21.0.235    real-mccoy.mit.edu
+172.21.0.135    shining-armor.mit.edu

trunk/server/fedora/config/etc/sysconfig/network-scripts/route-eth1

@@ -10 +10 @@
 18.181.0.234 via 172.21.0.234
 18.181.0.235 via 172.21.0.235
+18.181.0.135 via 172.21.0.135