maria-developers team mailing list archive

[Hakan Kuecuekyilmaz <hakan@xxxxxxxxxxxx>]

At file:///Users/hakan/work/monty_program/mariadb-tools/

------------------------------------------------------------
revno: 11 [merge]
revision-id: hakan@xxxxxxxxxxxx-20100226170755-uucbsqe4n60b50c1
parent: hakan@xxxxxxxxxxxx-20100226162413-118168qx5c9c02ml
parent: knielsen@hasky-20100223074854-mg13sm3jnan2s51a
committer: Hakan Kuecuekyilmaz <hakan@xxxxxxxxxxxx>
branch nick: mariadb-tools
timestamp: Fri 2010-02-26 17:07:55 +0000
message:
  Merge.
modified:
  buildbot/maria-master.cfg      mariamaster.cfg-20091218103450-cvifjz3i70oerkej-1

=== modified file 'buildbot/maria-master.cfg'
--- a/buildbot/maria-master.cfg	2010-02-02 15:10:12 +0000
+++ b/buildbot/maria-master.cfg	2010-02-23 07:48:54 +0000
@@ -113,7 +113,8 @@
                 "lp:~maria-captains/maria/maria-5.2-merge-5.1" : "maria-5.2-merge-5.1",
                 "lp:~maria-captains/maria/5.2-dsmrr" : "5.2-dsmrr",
                 "lp:~maria-captains/maria/5.3" : "5.3",
-                "lp:~maria-captains/maria/5.3-sj-subqueries" : "5.3-sj-subqueries"
+                "lp:~maria-captains/maria/5.3-sj-subqueries" : "5.3-sj-subqueries",
+                "lp:~maria-captains/maria/5.3-subqueries" : "5.3-subqueries"
                 }
 mailSource = mail.BzrLaunchpadEmailMaildirSource("/var/lib/buildbot/Maildir",
                                                  branchMap=myBranchMap)
@@ -154,7 +155,7 @@
               "mariadb-5.1-monty", "mariadb-5.2-monty",
               "mariadb-5.1-knielsen","5.1-release", "5.1-merge",
               "maria-5.1-wl24", "maria-5.1-vcol","maria-5.1-wl36","mysql-5.1-mwl36",
-              "5.1.39-oqgraph", "5.2-dsmrr", "5.3", "5.3-sj-subqueries"
+              "5.1.39-oqgraph", "5.2-dsmrr", "5.3", "5.3-sj-subqueries", "5.3-subqueries"
               ],
     treeStableTimer=60, # 1 sec for bzr
     builderNames=["centos5-debug", "hardy-x86-rtai", "hardy-amd64-makedist",
@@ -531,7 +532,7 @@
                              "slavename": "adutko-centos5-amd64",
                              "builddir": "centos5-amd64-minimal",
                              "factory": f_minimal,
-                             "category": "main",
+                             "category": "experimental",
                              }
 
 f_win32_rel_nmake = factory.BuildFactory()