summaryrefslogtreecommitdiff
path: root/.bzr-mysql
diff options
context:
space:
mode:
authorunknown <sanja@askmonty.org>2009-04-03 12:23:26 +0300
committerunknown <sanja@askmonty.org>2009-04-03 12:23:26 +0300
commitcce577ebd4915fca6c450f926f526c8e2ab8a9fd (patch)
tree059f6515c61a051857985434edf45771746bb90f /.bzr-mysql
parentf353f678107e68cf1fd09628414fd51b776f4da3 (diff)
parent032ef1fa0781490606c2cf690420464ed98ace8c (diff)
downloadmariadb-git-cce577ebd4915fca6c450f926f526c8e2ab8a9fd.tar.gz
5.1 -> 5.2 merge
Diffstat (limited to '.bzr-mysql')
-rw-r--r--.bzr-mysql/default.conf8
1 files changed, 4 insertions, 4 deletions
diff --git a/.bzr-mysql/default.conf b/.bzr-mysql/default.conf
index 2290d1638aa..b3e3e7127ca 100644
--- a/.bzr-mysql/default.conf
+++ b/.bzr-mysql/default.conf
@@ -1,6 +1,6 @@
[MYSQL]
-tree_location = lp:maria/2.0
+tree_location = lp:maria/5.2
post_commit_to = maria-developers@lists.launchpad.net
-post_commit_url = lp:maria/2.0
-tree_name = maria/2.0
-project_name = "mariadb 5.1, with Maria 2.0"
+post_commit_url = lp:maria/5.2
+tree_name = maria/5.2
+project_name = "Mariadb 5.2, with Maria 2.0"