summaryrefslogtreecommitdiff
path: root/.bzr-mysql
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2010-02-20 12:40:04 +0300
committerAlexander Nozdrin <alik@sun.com>2010-02-20 12:40:04 +0300
commited8097d0509f3ae75b1d91e84a7f5cec00075f84 (patch)
tree520d904f20e1a3c5ef204da9a42c51f7ad3bb4c8 /.bzr-mysql
parent6b443a7e2c72993ffbbe2eca1e89d48adf80499f (diff)
parent7b7dd8dc0a70fce68bb02b7f4fb6031089559a18 (diff)
downloadmariadb-git-ed8097d0509f3ae75b1d91e84a7f5cec00075f84.tar.gz
Auto-merge from mysql-trunk.
Diffstat (limited to '.bzr-mysql')
-rw-r--r--.bzr-mysql/default.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/.bzr-mysql/default.conf b/.bzr-mysql/default.conf
index 08ca040642e..4eab3d239d0 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"
-tree_name = "mysql-5.5-trunk-bugfixing"
+tree_name = "mysql-trunk-bugfixing"