[Buildbot-commits] [buildbot/buildbot] bec38d: Merge branch 'none-buildreq-fix' of git://github.c...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/buildbot/buildbot
  Commit: bec38d2adcb674de2547411e5cf17610b09d1872
      https://github.com/buildbot/buildbot/commit/bec38d2adcb674de2547411e5cf17610b09d1872
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2012-03-12 (Mon, 12 Mar 2012)

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

  Log Message:
  -----------
  Merge branch 'none-buildreq-fix' of git://github.com/djmitche/buildbot into buildbot-0.8.6

* 'none-buildreq-fix' of git://github.com/djmitche/buildbot:
  Do not rely on BuildRequestStatus._buildrequest being non-None


  Commit: 4f20e1a4cfd4876d4fc2b518570aad564602d23c
      https://github.com/buildbot/buildbot/commit/4f20e1a4cfd4876d4fc2b518570aad564602d23c
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2012-03-12 (Mon, 12 Mar 2012)

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

  Log Message:
  -----------
  Merge branch 'buildbot-0.8.6'

* buildbot-0.8.6:
  Do not rely on BuildRequestStatus._buildrequest being non-None

Conflicts: (over inlineCallbacks)
	master/buildbot/status/buildrequest.py
	master/buildbot/status/web/builder.py
  including a fix for non-yielded Deferreds


Compare: https://github.com/buildbot/buildbot/compare/cfa1313...4f20e1a