[Buildbot-commits] [buildbot/buildbot] ffe5bb: Merge branch 'lock-scheduling'

[noreply at github.com]

  Branch: refs/heads/master
  Home:   https://github.com/buildbot/buildbot

  Commit: ffe5bb2662f1554d9a83d6cbc1c1c77f2e5a1f32
      https://github.com/buildbot/buildbot/commit/ffe5bb2662f1554d9a83d6cbc1c1c77f2e5a1f32
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2011-11-17 (Thu, 17 Nov 2011)

  Changed paths:
    M master/buildbot/buildslave.py
  M master/buildbot/locks.py

  Log Message:
  -----------
  Merge branch 'lock-scheduling'

* lock-scheduling:
  changes suggested by dwlocks
  Re-try scheduling build requests for slaves when locks are released

Conflicts:
	master/buildbot/buildslave.py