[Buildbot-commits] [djmitche/buildbot] 630eab: Cope with no slave locks

[noreply at github.com]

Branch: refs/heads/master
Home:   http://github.com/djmitche/buildbot

Commit: 630eabf3c17cbb3c3e294fbc7413b1c4488619c1
    http://github.com/djmitche/buildbot/commit/630eabf3c17cbb3c3e294fbc7413b1c4488619c1
Author: John Carr <john.carr at unrouted.co.uk>
Date:   2010-07-07 (Wed, 07 Jul 2010)

Changed paths:
  M master/buildbot/buildslave.py

Log Message:
-----------
Cope with no slave locks


Commit: ebb7e751f0ce118fe5d303a607bc17527a973016
    http://github.com/djmitche/buildbot/commit/ebb7e751f0ce118fe5d303a607bc17527a973016
Author: Dustin J. Mitchell <dustin at zmanda.com>
Date:   2010-07-07 (Wed, 07 Jul 2010)

Changed paths:
  M master/buildbot/buildslave.py

Log Message:
-----------
Merge branch 'cope-with-no-slave-locks' of git://github.com/Jc2k/buildbot

* 'cope-with-no-slave-locks' of git://github.com/Jc2k/buildbot:
  Cope with no slave locks