summaryrefslogtreecommitdiff
path: root/.bzr-mysql
diff options
context:
space:
mode:
authorBjorn Munch <Bjorn.Munch@sun.com>2009-09-18 16:44:11 +0200
committerBjorn Munch <Bjorn.Munch@sun.com>2009-09-18 16:44:11 +0200
commitf89b36fcbfff959d5f396702cc96d64f66cd6522 (patch)
tree9bc9b5f2b9ed75a2724413e7f1a4e3dd3d1760dc /.bzr-mysql
parentc18e4b42b32e89307f5c903566b6ee43da12466f (diff)
parentd0408492669d37167708ac6e2642327d2deb5e5f (diff)
downloadmariadb-git-f89b36fcbfff959d5f396702cc96d64f66cd6522.tar.gz
new merge from 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 834e08a9dfe..a81954c9bcd 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.4-mtr"
+tree_name = "mysql-trunk-mtr"