[Buildbot-commits] [buildbot/buildbot] 9b8170: reject the *new* slave when a dupe slave connects

[noreply at github.com]

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

Commit: 9b8170191deb587df4395fb44931071b1df32b25
    http://github.com/buildbot/buildbot/commit/9b8170191deb587df4395fb44931071b1df32b25
Author: Dustin J. Mitchell <dustin at zmanda.com>
Date:   2010-08-26 (Thu, 26 Aug 2010)

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

Log Message:
-----------
reject the *new* slave when a dupe slave connects

This, coupled with a ping of the old slave, will keep double slaves from
killing one another

Fixes #962


Commit: a456a68af24a816979762edea6a535af7ac2dde7
    http://github.com/buildbot/buildbot/commit/a456a68af24a816979762edea6a535af7ac2dde7
Author: Dustin J. Mitchell <dustin at zmanda.com>
Date:   2010-08-26 (Thu, 26 Aug 2010)

Changed paths:
  M master/buildbot/process/buildstep.py
  M master/buildbot/status/tinderbox.py

Log Message:
-----------
Merge branch 'master' of github.com:buildbot/buildbot

* 'master' of github.com:buildbot/buildbot:
  Two more fixes for log stuff