Changeset 1414 for branches/locker-dev/locker/sql/bin/save-password

Timestamp:

Jan 12, 2010, 11:55:27 PM (15 years ago)

Author:

ezyang

Message:

Merged in changes from trunk

--- Merging r1262 through r1413 into 'deploy/bin':
U    deploy/bin/django
   C deploy/bin/rails
   > Resolved by accepting working copy
--- Merging r1221 through r1413 into '.':
U    sql/bin/get-password
U    sql/bin/save-password
U    doc/tickets/rt.txt
U    doc/tickets/cnames.txt
U    bin/fix-php-ini
   C bin/scripts-rails
   > Resolved by accepting working copy
Skipped 'bin/for-each-server'
 U   bin
U    sbin/parallel-find.pl
U    sbin/commit-email.pl
U    sbin/commit-zephyr
Summary of conflicts:
  Tree conflicts: 2
  Skipped paths: 1

Location:

branches/locker-dev/locker

Files:

• . (modified) (1 prop)
• sql/bin/save-password (modified) (1 diff)

branches/locker-dev/locker/sql/bin/save-password

@@ -8 +8 @@
 rm -f $lroot/.sql/my.cnf $lroot/.my.cnf
 
-echo "[mysql]
+echo "[client]
 host=sql.mit.edu
 user=$sqluser