Changeset 1697
- Timestamp:
- Oct 23, 2010, 10:33:50 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/fc13-dev merged: 1682,1686
- Property svn:mergeinfo changed
-
trunk/locker/bin
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/locker/bin/scripts-remove
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/locker/bin/signup-minimal
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/locker/bin/signup-sql
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/locker/deploy/bin
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/locker/sql/bin/save-password
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/server/common/oursrc/execsys/execsys-binfmt
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/server/common/oursrc/php_scripts/php_scripts-config.m4
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/server/fedora/config/etc
- Property svn:mergeinfo deleted
-
trunk/server/fedora/config/etc/httpd/conf.d/scripts-vhost-names.conf
r1693 r1697 1 1 ServerName scripts.mit.edu 2 ServerAlias scripts 18.181.0.43 scripts-vhosts.mit.edu scripts-vhosts 18.181.0.46 scripts-test.mit.edu scripts-test 18.181.0.229 better-mousetrap.mit.edu better-mousetrap b-m.mit.edu b-m scripts1.mit.edu scripts1 18.181.0.57 old-faithful.mit.edu old-faithful o-f.mit.edu o-f scripts2.mit.edu scripts2 18.181.0.53 bees-knees.mit.edu bees-knees b-k.mit.edu b-k sx-blade-4.mit.edu sx-blade-4 scripts3.mit.edu scripts3 18.181.0.167 cats-whiskers.mit.edu cats-whiskers c-w.mit.edu c-w scripts4.mit.edu scripts4 18.181.0.228 pancake-bunny.mit.edu pancake-bunny p-b.mit.edu p-b scripts6.mit.edu scripts6 18.181.0.237 busy-beaver.mit.edu busy-beaver b-b.mit.edu b-b scripts7.mit.edu scripts7 18.181.0.234 real-mccoy.mit.edu real-mccoy r-m.mit.edu r-m scripts8.mit.edu scripts8 18.181.0.235 w-e whole-enchilada w-e.mit.edu whole-enchilada.mit.edu 18.181.0.236 localhost 127.0.0.1 ::12 ServerAlias scripts 18.181.0.43 scripts-vhosts.mit.edu scripts-vhosts 18.181.0.46 scripts-test.mit.edu scripts-test 18.181.0.229 better-mousetrap.mit.edu better-mousetrap b-m.mit.edu b-m scripts1.mit.edu scripts1 18.181.0.57 old-faithful.mit.edu old-faithful o-f.mit.edu o-f scripts2.mit.edu scripts2 18.181.0.53 bees-knees.mit.edu bees-knees b-k.mit.edu b-k sx-blade-4.mit.edu sx-blade-4 scripts3.mit.edu scripts3 18.181.0.167 cats-whiskers.mit.edu cats-whiskers c-w.mit.edu c-w scripts4.mit.edu scripts4 18.181.0.228 pancake-bunny.mit.edu pancake-bunny p-b.mit.edu p-b scripts6.mit.edu scripts6 18.181.0.237 busy-beaver.mit.edu busy-beaver b-b.mit.edu b-b scripts7.mit.edu scripts7 18.181.0.234 real-mccoy.mit.edu real-mccoy r-m.mit.edu r-m scripts8.mit.edu scripts8 18.181.0.235 w-e whole-enchilada w-e.mit.edu whole-enchilada.mit.edu 18.181.0.236 s-a shining-armor s-a.mit.edu shining-armor.mit.edu 18.181.0.135 localhost 127.0.0.1 ::1
Note: See TracChangeset
for help on using the changeset viewer.