Changeset 1847 for branches

Timestamp:

May 3, 2011, 2:06:36 AM (14 years ago)

Author:

adehnert

Message:

Merge changes from master

Location:

branches/locker-dev/locker

Files:

• . (modified) (1 prop)
• bin (modified) (1 prop)
• bin/crontab (modified) (1 prop)
• bin/firefox-test (modified) (1 diff)
• deploy/bin (modified) (1 prop)
• deploy/bin/django (modified) (1 prop)
• deploy/bin/onathena (modified) (1 prop)
• deploy/bin/rails (modified) (1 prop)
• deploy/bin/trac (modified) (1 prop)
• deploy/bin/turbogears (modified) (1 prop)
• doc/cluedump (copied) (copied from trunk/locker/doc/cluedump)
• sbin (modified) (1 prop)
• sbin/check-ldap-cert.pl (copied) (copied from trunk/locker/sbin/check-ldap-cert.pl)
• sbin/get-ldap-admins (copied) (copied from trunk/locker/sbin/get-ldap-admins)
• sbin/rpm-master.sh (copied) (copied from trunk/locker/sbin/rpm-master.sh)
• sbin/rpmlist.sh (copied) (copied from trunk/locker/sbin/rpmlist.sh)
• sbin/ssl-get-endtime (copied) (copied from trunk/locker/sbin/ssl-get-endtime)
• sql/bin/save-password (modified) (1 prop)

branches/locker-dev/locker/bin/firefox-test

@@ -3 +3 @@
 LD_PRELOAD=/mit/scripts/scripts-test/@sys/scripts-test-preload.so
 export LD_PRELOAD
-exec firefox
+exec firefox -no-remote