[Buildbot-commits] [buildbot/buildbot] 3652f4: fix cancelAfter and its tests

[GitHub]

  Branch: refs/heads/nine
  Home:   https://github.com/buildbot/buildbot
  Commit: 3652f4caa230b65818560de5a1df7f8fcf03c329
      https://github.com/buildbot/buildbot/commit/3652f4caa230b65818560de5a1df7f8fcf03c329
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-09-29 (Sun, 29 Sep 2013)

  Changed paths:
    M master/buildbot/test/unit/test_util_misc.py
    M master/buildbot/util/misc.py

  Log Message:
  -----------
  fix cancelAfter and its tests


  Commit: 25a014941597f8bbba8ef1f36d24c845332dbb9e
      https://github.com/buildbot/buildbot/commit/25a014941597f8bbba8ef1f36d24c845332dbb9e
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-09-29 (Sun, 29 Sep 2013)

  Changed paths:
    M master/buildbot/test/integration/test_slave_comm.py

  Log Message:
  -----------
  fix duplicate slave tests to wait for the correct detach to complete


  Commit: 0af3c4a77b7bcb74d37d180e747ab9daaa00ed7f
      https://github.com/buildbot/buildbot/commit/0af3c4a77b7bcb74d37d180e747ab9daaa00ed7f
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-09-29 (Sun, 29 Sep 2013)

  Changed paths:
    M master/buildbot/test/integration/test_slave_comm.py
    M master/buildbot/test/unit/test_util_misc.py
    M master/buildbot/util/misc.py

  Log Message:
  -----------
  Merge branch 'slave-proto' into nine


Compare: https://github.com/buildbot/buildbot/compare/d13c05308789...0af3c4a77b7b