Ignore:
Timestamp:
Jan 12, 2010, 11:55:27 PM (13 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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/locker-dev/locker

  • branches/locker-dev/locker/sql/bin/get-password

    r1049 r1414  
    4848        case 1:
    4949                $myPassword = `/usr/bin/sql-signup`;
    50         file_put_contents($cnfPath, "[mysql]\nhost=$host\nuser=$env_user\npassword=$myPassword\n");
     50        file_put_contents($cnfPath, "[client]\nhost=$host\nuser=$env_user\npassword=$myPassword\n");
    5151        $cnfinfo = getMyCnfInfo($cnfPath);
    5252        if (is_array($cnfinfo)) {
Note: See TracChangeset for help on using the changeset viewer.