[Buildbot-commits] [buildbot/buildbot] a88834: improved configuration error message when mode 'al...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/buildbot/buildbot
  Commit: a88834d47435b0abec405c6cc00d1ded66ff90b1
      https://github.com/buildbot/buildbot/commit/a88834d47435b0abec405c6cc00d1ded66ff90b1
  Author: Tim Flink <tflink at fedoraproject.org>
  Date:   2013-03-18 (Mon, 18 Mar 2013)

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

  Log Message:
  -----------
  improved configuration error message when mode 'all' is set in an iterable for a MailNotifier


  Commit: 6882900198fc66b16c5343c61e9442e085dd794c
      https://github.com/buildbot/buildbot/commit/6882900198fc66b16c5343c61e9442e085dd794c
  Author: Tim Flink <tflink at fedoraproject.org>
  Date:   2013-03-18 (Mon, 18 Mar 2013)

  Changed paths:
    M master/docs/manual/cfg-statustargets.rst

  Log Message:
  -----------
  updating manual to clarify the use of 'all' and 'warnings' as shortcuts in MailNotifier configuration


  Commit: ccd1ca42015818b8e4acd4c882fcc2e8f4af339f
      https://github.com/buildbot/buildbot/commit/ccd1ca42015818b8e4acd4c882fcc2e8f4af339f
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-11-17 (Sun, 17 Nov 2013)

  Changed paths:
    M master/buildbot/status/mail.py
    M master/buildbot/test/unit/test_status_mail.py
    M master/docs/manual/cfg-statustargets.rst

  Log Message:
  -----------
  Merge branch 'master' of git://github.com/tflink/buildbot

Conflicts:
	master/buildbot/test/unit/test_status_mail.py
plus autopep8


Compare: https://github.com/buildbot/buildbot/compare/bc24699e6708...ccd1ca420158