[Buildbot-commits] [buildbot/buildbot] 78bea1: Use a properly-formed default mergeRequests functi...

[noreply at github.com]

  Branch: refs/heads/buildbot-0.8.4
  Home:   https://github.com/buildbot/buildbot

  Commit: 78bea192df2fa04472181e4de030785545d6ffbd
      https://github.com/buildbot/buildbot/commit/78bea192df2fa04472181e4de030785545d6ffbd
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2011-07-01 (Fri, 01 Jul 2011)

  Changed paths:
    M master/buildbot/process/builder.py
  M master/buildbot/test/unit/test_process_builder.py

  Log Message:
  -----------
  Use a properly-formed default mergeRequests function

This function takes the requisite three arguments (builder, req1, req2),
and calls through to the BuildRequest.canBeMergedWith method.

Fixes #2025.


  Commit: e258afa1db70efcea9522657b33f9fb5a3bf3149
      https://github.com/buildbot/buildbot/commit/e258afa1db70efcea9522657b33f9fb5a3bf3149
  Author: Aurelian Bompard <aurelien at bompard.org>
  Date:   2011-07-02 (Sat, 02 Jul 2011)

  Changed paths:
    M master/buildbot/status/mail.py

  Log Message:
  -----------
  Allow MailNotifier subject to be overridden

Fixes #2014.


  Commit: ee833ea79f42dfb182a98b86e068d62510098a79
      https://github.com/buildbot/buildbot/commit/ee833ea79f42dfb182a98b86e068d62510098a79
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2011-07-02 (Sat, 02 Jul 2011)

  Changed paths:
    M master/buildbot/process/build.py
  M master/buildbot/status/mail.py
  M master/buildbot/test/unit/test_process_builder.py
  M master/docs/cfg-buildsteps.texinfo
  M master/docs/cfg-statustargets.texinfo

  Log Message:
  -----------
  0.8.4 Branch fixups for properties

Do not render properties in MailNotifier extraHeaders (Refs #2021)

Make the WithProperties callable example work (Refs #2024)


  Commit: 37f64f5476e0da77ac5e1e5485657a456ab19290
      https://github.com/buildbot/buildbot/commit/37f64f5476e0da77ac5e1e5485657a456ab19290
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2011-07-02 (Sat, 02 Jul 2011)

  Changed paths:
    M master/buildbot/status/builder.py

  Log Message:
  -----------
  remove incorrect assertion

Fixes #2028.


Compare: https://github.com/buildbot/buildbot/compare/2310000...37f64f5