# HG changeset patch
# User Jeff Hammel <jhammel@mozilla.com>
# Date 1324513776 28800
# Node ID ec60fe53c36ce5e02e3a65d86b0beebe6fd2ae79
# Parent  d4637641be6e7f31f8879b957ed042dc94ab6933
use our own gitpoller; the one included in buildbot does not work with e.g. git 1.6.3

diff -r d4637641be6e -r ec60fe53c36c autobot/template/master/master.cfg
--- a/autobot/template/master/master.cfg	Wed Dec 07 14:18:23 2011 -0800
+++ b/autobot/template/master/master.cfg	Wed Dec 21 16:29:36 2011 -0800
@@ -20,7 +20,7 @@
            'hg':  set()}
 
 builder_sources = {}
-           
+
 # define builder factories
 from autobot.projects import factories as factory_dict
 from autobot.projects import args
@@ -37,7 +37,7 @@
 
         # make a factory
         f = factory_dict[factory](**factory_args)
-        
+
         # define builder
         buildername = '%s - %s' % (factory, slave)
         b = {'name': buildername,
@@ -56,14 +56,14 @@
             for source, branch in _sources:
                 sources[source_type].add((source, branch))
                 builder_sources.setdefault((source, branch), []).append(buildername)
-    
+
 c['builders'] = builders
 
 ####### CHANGESOURCES
 from buildbot.changes.pb import PBChangeSource
 c['change_source'] = [PBChangeSource()]
 
-from buildbot.changes.gitpoller import GitPoller
+from autobot.changes.gitpoller import GitPoller
 from autobot.changes.poller import HgPoller
 
 pollInterval = int(config.master.get('pollInterval', 60))