[Buildbot-commits] [buildbot/buildbot] 6f41af: Merge branch 'upgrade-master-fixes' of git://githu...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/buildbot/buildbot
  Commit: 6f41afbcffcdc67f552ba4e2747bd09991b3054b
      https://github.com/buildbot/buildbot/commit/6f41afbcffcdc67f552ba4e2747bd09991b3054b
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2012-03-16 (Fri, 16 Mar 2012)

  Changed paths:
    M master/buildbot/scripts/runner.py

  Log Message:
  -----------
  Merge branch 'upgrade-master-fixes' of git://github.com/tomprince/buildbot

* 'upgrade-master-fixes' of git://github.com/tomprince/buildbot:
  Don't fail upgrading, if the public_html updates can't be written.
  Change to correct directory before loading config in upgrade-master.