[Buildbot-commits] [buildbot/buildbot] aa687f: Merge branch 'mail-notifier' of https://github.com...

[GitHub]

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

  Changed paths:
    M master/buildbot/status/mail.py
  M master/buildbot/status/master.py
  M master/buildbot/test/unit/test_status_mail.py

  Log Message:
  -----------
  Merge branch 'mail-notifier' of https://github.com/tomprince/buildbot into buildbot-0.8.6

* 'mail-notifier' of https://github.com/tomprince/buildbot:
  Fix bogus reference to master_status.db in buildbot.status.mail.


  Commit: 6aba4c4f37b47fe526b9ebbb9581116b73285eb4
      https://github.com/buildbot/buildbot/commit/6aba4c4f37b47fe526b9ebbb9581116b73285eb4
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2012-03-24 (Sat, 24 Mar 2012)

  Changed paths:
    M master/buildbot/status/mail.py
  M master/buildbot/status/master.py
  M master/buildbot/test/unit/test_status_mail.py

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

* buildbot-0.8.6:
  Fix bogus reference to master_status.db in buildbot.status.mail.


Compare: https://github.com/buildbot/buildbot/compare/5225a76...6aba4c4