Changeset 2073 for branches/locker-dev
- Timestamp:
- Nov 23, 2011, 4:05:31 PM (13 years ago)
- Location:
- branches/locker-dev/locker
- Files:
-
- 8 deleted
- 10 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/locker-dev/locker
- Property svn:mergeinfo changed
-
branches/locker-dev/locker/bin
- Property svn:mergeinfo changed
/branches/fc15-dev/locker/bin (added) merged: 1878,1938,1947,1973,1989,2026,2039,2055,2064 /trunk/locker/bin merged: 1903-1906,1920,1954,2066
- Property svn:mergeinfo changed
-
branches/locker-dev/locker/bin/scripts-ssh
r1343 r2073 9 9 -o PreferredAuthentications=gssapi-with-mic \ 10 10 -o ForwardX11=no \ 11 -o GlobalKnownHostsFile=/afs/athena.mit.edu/contrib/scripts/ ssh/known_hosts \11 -o GlobalKnownHostsFile=/afs/athena.mit.edu/contrib/scripts/etc/known_hosts \ 12 12 -o UserKnownHostsFile=/dev/null \ 13 13 -t \ -
branches/locker-dev/locker/bin/scripts-start
r1846 r2073 6 6 echo 'gallery2 Gallery2' 7 7 echo 'phpbb phpBB' 8 echo 'phpical PHP iCalendar' 8 echo 'joomla Joomla' 9 echo 'git Git repository' 9 10 echo 'trac Trac' 10 echo 'joomla Joomla'11 11 echo 'turbogears TurboGears' 12 12 echo 'django Django' -
branches/locker-dev/locker/bin/ssh
- Property svn:executable set to *
r793 r2073 11 11 -o PreferredAuthentications=gssapi-with-mic \ 12 12 -o ForwardX11=no \ 13 -o GlobalKnownHostsFile=/afs/athena.mit.edu/contrib/scripts/ ssh/known_hosts \13 -o GlobalKnownHostsFile=/afs/athena.mit.edu/contrib/scripts/etc/known_hosts \ 14 14 -o UserKnownHostsFile=/dev/null \ 15 15 "$@" -
branches/locker-dev/locker/deploy/bin
- Property svn:mergeinfo changed
/branches/fc15-dev/locker/deploy/bin (added) merged: 1878,1938,1947,1973,1989,2026,2039,2055,2064 /trunk/locker/deploy/bin merged: 1903-1904,2066
- Property svn:mergeinfo changed
-
branches/locker-dev/locker/deploy/bin/django
- Property svn:mergeinfo changed
/branches/fc15-dev/locker/deploy/bin/django (added) merged: 1878,1938,1947,1973,1989,2026,2039,2055,2064 /trunk/locker/deploy/bin/django merged: 2066
- Property svn:mergeinfo changed
-
branches/locker-dev/locker/deploy/bin/rails
- Property svn:mergeinfo changed
/branches/fc15-dev/locker/deploy/bin/rails (added) merged: 1878,1938,1947,1973,1989,2026,2039,2055,2064 /trunk/locker/deploy/bin/rails merged: 2066
- Property svn:mergeinfo changed
-
branches/locker-dev/locker/deploy/bin/trac
- Property svn:mergeinfo changed
/branches/fc15-dev/locker/deploy/bin/trac (added) merged: 1878,1938,1947,1973,1989,2026,2039,2055,2064 /trunk/locker/deploy/bin/trac merged: 2066
- Property svn:mergeinfo changed
-
branches/locker-dev/locker/sql/bin/save-password
- Property svn:mergeinfo changed
/branches/fc15-dev/locker/sql/bin/save-password (added) merged: 1878,1938,1947,1973,1989,2026,2039,2055,2064 /trunk/locker/sql/bin/save-password merged: 2066
- Property svn:mergeinfo changed
Note: See TracChangeset
for help on using the changeset viewer.