# HG changeset patch
# User Jeff Hammel <jhammel@mozilla.com>
# Date 1295922119 28800
# Node ID 7a0939d575db5e216ac4306ac0d5d22433ccdc0b
# Parent  4c6e4bb9a1273815094bd2e1b12af3e508fc97d1
exceptions.RuntimeError: cannot specify both change_filter and either branch or categories

diff -r 4c6e4bb9a127 -r 7a0939d575db autobot/template/master/master.cfg
--- a/autobot/template/master/master.cfg	Mon Jan 24 18:21:21 2011 -0800
+++ b/autobot/template/master/master.cfg	Mon Jan 24 18:21:59 2011 -0800
@@ -84,7 +84,6 @@
 for (source, branch), buildernames in builder_sources.items():
     change_filter = ChangeFilter(repository=source, branch=branch)
     c['schedulers'].append(Scheduler(name="%s#%s" % (source, branch),
-                                     branch=branch,
                                      treeStableTimer=treeStableTimer,
                                      change_filter=change_filter,
                                      builderNames=buildernames))