summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2009-12-23 15:10:25 +0300
committerAlexander Nozdrin <alik@sun.com>2009-12-23 15:10:25 +0300
commit4a489a2592b6efdcd552ed8c575f93fff2b9a9fe (patch)
tree0e91beebd2c313fd1c9f870b64a262bc7e499dd2
parentd6cc32a04729b4223d2b6ffcf7964c14b88589cc (diff)
parent5be5b55ff4ce2c9fce0563e1a729d13e92a7d423 (diff)
downloadmariadb-git-4a489a2592b6efdcd552ed8c575f93fff2b9a9fe.tar.gz
Merge default.conf from mysql-trunk.
-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 278fc8fdb7f..e9ae26ca793 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-next-mr-bugfixing"
+tree_name = "mysql-5.5-next-mr"