Skip to content

Commit

Permalink
Merge branch 'master' into nine
Browse files Browse the repository at this point in the history
Conflicts:
	master/buildbot/process/buildstep.py
  • Loading branch information
djmitche committed May 26, 2014
2 parents da12d23 + 03122b4 commit 98ee615
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion master/docs/manual/customization.rst
Expand Up @@ -747,7 +747,7 @@ For large log files on a busy master, this behavior can quickly consume a great

Instead, steps should implement a :class:`~buildbot.process.logobserver.LogObserver` to examine log files one chunk or line at a time.

In fact, the only access to log contents after the log has been written is via the Data API.
For commands which only produce a small quantity of output, :class:`~buildbot.process.remotecommand.RemoteCommand` will collect the command's stdout into its :attr:`~buildbot.process.remotecommand.RemoteCommand.stdout` attribute if given the ``collectStdout=True`` constructor argument.

.. _Adding-LogObservers:

Expand Down

0 comments on commit 98ee615

Please sign in to comment.