[Buildbot-commits] buildbot ChangeLog,1.1033,1.1034

[Brian Warner]

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

Modified Files:
	ChangeLog 
Log Message:
[project @ steps.shell: remove redundant definition of render()]

Original author: warner at lothar.com
Date: 2008-03-21 01:34:01+00:00

Index: ChangeLog
===================================================================
RCS file: /cvsroot/buildbot/buildbot/ChangeLog,v
retrieving revision 1.1033
retrieving revision 1.1034
diff -u -d -r1.1033 -r1.1034
--- ChangeLog	21 Mar 2008 01:31:59 -0000	1.1033
+++ ChangeLog	21 Mar 2008 01:34:27 -0000	1.1034
@@ -1,5 +1,8 @@
 2008-03-20  Brian Warner  <warner at lothar.com>
 
+	* buildbot/steps/shell.py (render): oops, remove redundant
+	definition that probably crept in during a merge conflict
+
 	* buildbot/scheduler.py (Triggerable): cleanup: wrap docstring
 	* buildbot/steps/trigger.py (Trigger): cleanup: rename schedulers=
 	to schedulerNames=, make updateSourceStamp=True by default, tolerate