[Buildbot-commits] buildbot ChangeLog,1.576,1.577

[Brian Warner]

Update of /cvsroot/buildbot/buildbot
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6153

Modified Files:
	ChangeLog 
Log Message:
(MaildirTest): rename the 'timeout' method, as it collides with trial's
internals


Index: ChangeLog
===================================================================
RCS file: /cvsroot/buildbot/buildbot/ChangeLog,v
retrieving revision 1.576
retrieving revision 1.577
diff -u -d -r1.576 -r1.577
--- ChangeLog	12 Mar 2006 11:54:00 -0000	1.576
+++ ChangeLog	13 Mar 2006 05:48:36 -0000	1.577
@@ -1,5 +1,8 @@
 2006-03-12  Brian Warner  <warner at lothar.com>
 
+	* buildbot/test/test_maildir.py (MaildirTest): rename the
+	'timeout' method, as it collides with trial's internals
+
 	* buildbot/scripts/runner.py: add 'buildbot restart' command
 	(stop): don't sys.exit() out of here, otherwise restart can't work
 	* docs/buildbot.texinfo (Shutdown): document it