summaryrefslogtreecommitdiff
path: root/.bzr-mysql/default.conf
diff options
context:
space:
mode:
authorKonstantin Osipov <kostja@sun.com>2009-12-16 11:33:54 +0300
committerKonstantin Osipov <kostja@sun.com>2009-12-16 11:33:54 +0300
commit980e8b413e89175d8fc7f867415712589bead9ff (patch)
tree765dbf44bc16c28e3d63a3439bed89b86e4b92fc /.bzr-mysql/default.conf
parentd1dfce06b254548e108deabfe8a7e6b759984d5d (diff)
parent376cf4275f28f6b8167eaf19b2c66dee41fbc5c5 (diff)
downloadmariadb-git-980e8b413e89175d8fc7f867415712589bead9ff.tar.gz
Merge next-mr -> next-4284.
Diffstat (limited to '.bzr-mysql/default.conf')
-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 5df64e1b26c..5a9b839489f 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.6-next-mr-bugfixing"
+tree_name = "mysql-5.6-next-mr"