diff options
| author | Joerg Bruehe <joerg.bruehe@oracle.com> | 2012-03-20 22:27:49 +0100 |
|---|---|---|
| committer | Joerg Bruehe <joerg.bruehe@oracle.com> | 2012-03-20 22:27:49 +0100 |
| commit | a70c8c4b208096c376de065fc7e2d036256f3306 (patch) | |
| tree | 090ea3ae9b50973297879fb1882004bcd4ea5c6c /.bzr-mysql | |
| parent | 4320a81f925585855b43a40da6bb81ef9e47c644 (diff) | |
| parent | a9f3b2f5703e477bd60a1d917ff9e108470b7503 (diff) | |
| download | mariadb-git-a70c8c4b208096c376de065fc7e2d036256f3306.tar.gz | |
Merge the 5.5.22 release build into main 5.5,
conflict in "sql/filesort.cc" solved manually.
Diffstat (limited to '.bzr-mysql')
| -rw-r--r-- | .bzr-mysql/default.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.bzr-mysql/default.conf b/.bzr-mysql/default.conf index 43d479a1043..cd22619d7b4 100644 --- a/.bzr-mysql/default.conf +++ b/.bzr-mysql/default.conf @@ -1,4 +1,4 @@ [MYSQL] -post_commit_to = "commits@lists.mysql.com" -post_push_to = "commits@lists.mysql.com" +post_commit_to = "MYSQL_COMMITS_WW@ORACLE.COM" +post_push_to = "MYSQL_COMMITS_WW@ORACLE.COM" tree_name = "mysql-5.5" |