[Buildbot-commits] [buildbot/buildbot] 34fd47: Merge branch 'bug2278' into buildbot-0.8.6

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/buildbot/buildbot
  Commit: 34fd47dbfcc0e6440b84bdecec5b8f21ddeac000
      https://github.com/buildbot/buildbot/commit/34fd47dbfcc0e6440b84bdecec5b8f21ddeac000
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-04-23 (Mon, 23 Apr 2012)

  Changed paths:
    M master/buildbot/buildslave.py
    M master/buildbot/process/botmaster.py
    A master/buildbot/test/fake/botmaster.py
    M master/buildbot/test/unit/test_buildslave.py
    M master/buildbot/test/unit/test_process_botmaster_BotMaster.py

  Log Message:
  -----------
  Merge branch 'bug2278' into buildbot-0.8.6

Conflicts:
	master/buildbot/test/unit/test_buildslave.py


  Commit: 5d202962b2e01e3bf07e9a6bc85f51a9995e426c
      https://github.com/buildbot/buildbot/commit/5d202962b2e01e3bf07e9a6bc85f51a9995e426c
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-05-16 (Wed, 16 May 2012)

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

  Log Message:
  -----------
  Fix upgrading old builds?


  Commit: 2717407450b0710a5fc1e3a92b9cad55f965bf9d
      https://github.com/buildbot/buildbot/commit/2717407450b0710a5fc1e3a92b9cad55f965bf9d
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2012-05-28 (Mon, 28 May 2012)

  Changed paths:
    M master/buildbot/status/build.py
    M master/buildbot/test/integration/test_upgrade.py
    A master/buildbot/test/integration/v085-README.txt
    A master/buildbot/test/integration/v085.tgz

  Log Message:
  -----------
  add upgrade test from v0.8.5


  Commit: 9dc97f447339206a55bac069e692f49d8167681d
      https://github.com/buildbot/buildbot/commit/9dc97f447339206a55bac069e692f49d8167681d
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2012-05-28 (Mon, 28 May 2012)

  Changed paths:
    M master/buildbot/test/integration/test_upgrade.py
    A master/buildbot/test/integration/v086p1.tgz

  Log Message:
  -----------
  upgrade tests for 0.8.6p1, too


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

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

  Log Message:
  -----------
  unpickle v0.8.2 pickles too


  Commit: 72258477482d6bba6ca1bda7e7e38c4c087fab47
      https://github.com/buildbot/buildbot/commit/72258477482d6bba6ca1bda7e7e38c4c087fab47
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2012-05-28 (Mon, 28 May 2012)

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

  Log Message:
  -----------
  Merge branch 'pickle-error' of git://github.com/tomprince/buildbot

* 'pickle-error' of git://github.com/tomprince/buildbot:
  Fix upgrading old builds?


Compare: https://github.com/buildbot/buildbot/compare/935399f...7225847