Changeset 2246 for trunk/server/fedora/config/etc/httpd/conf.d

Timestamp:

Jun 27, 2012, 10:29:47 PM (12 years ago)

Author:

ezyang

Message:

Reintegrate Fedora 17 development branch into trunk.

Location:

trunk

Files:

• . (modified) (1 prop)
• server/fedora/config/etc/httpd/conf.d/scripts-vhost-names.conf (modified) (1 diff)

trunk/server/fedora/config/etc/httpd/conf.d/scripts-vhost-names.conf

@@ -14 +14 @@
     shining-armor.mit.edu shining-armor s-a.mit.edu s-a scripts9.mit.edu scripts9 18.181.0.135 \
     golden-egg.mit.edu golden-egg g-e.mit.edu g-e scripts10.mit.edu scripts10 18.181.0.141 \
+    miracle-cure.mit.edu miracle-cure m-c.mit.edu m-c scripts11.mit.edu scripts11 18.181.0.203 \
+    lucky-star.mit.edu lucky-star l-s.mit.edu l-s scripts12.mit.edu scripts12 18.181.0.204 \
     localhost 127.0.0.1 ::1