[Buildbot-commits] [buildbot/buildbot] e8f9ef: Merge branch 'ternary-split'

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/buildbot/buildbot
  Commit: e8f9ef997c7ed6f404144b361e5276616899899d
      https://github.com/buildbot/buildbot/commit/e8f9ef997c7ed6f404144b361e5276616899899d
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-05-17 (Thu, 17 May 2012)

  Changed paths:
    M master/buildbot/process/properties.py
    M master/buildbot/test/unit/test_process_properties.py

  Log Message:
  -----------
  Merge branch 'ternary-split'


  Commit: 34a3f6d9a6121b860d36f7c5b80f5bb96a251119
      https://github.com/buildbot/buildbot/commit/34a3f6d9a6121b860d36f7c5b80f5bb96a251119
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-05-18 (Fri, 18 May 2012)

  Changed paths:
    M master/buildbot/status/web/baseweb.py

  Log Message:
  -----------
  Fix race condition during web status reconfig.

Service.setServiceParent starts the current service, if the parent is already started.
Thus, the current service needs to be ready to run when we call it.

Fixes #2301.


  Commit: 63c3a92e47ff90329c39dbaea121dea69c01e2db
      https://github.com/buildbot/buildbot/commit/63c3a92e47ff90329c39dbaea121dea69c01e2db
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2012-05-27 (Sun, 27 May 2012)

  Changed paths:
    M master/buildbot/status/web/baseweb.py

  Log Message:
  -----------
  Merge branch 'bug2301' of https://github.com/tomprince/buildbot

* 'bug2301' of https://github.com/tomprince/buildbot:
  Fix race condition during web status reconfig.


  Commit: cc5b2ed5a952250846d98b06617dbf346bbc9998
      https://github.com/buildbot/buildbot/commit/cc5b2ed5a952250846d98b06617dbf346bbc9998
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2012-05-27 (Sun, 27 May 2012)

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

  Log Message:
  -----------
  Don't reset webstatus.master to None when it is replaced

This is an awful hack, but re-creating WebStatus on every reconfig is
also a bad idea.  Fixes #2301.


Compare: https://github.com/buildbot/buildbot/compare/4531107...cc5b2ed