[Buildbot-commits] [djmitche/buildbot] 2d97c0: Merge branch 'mailnotifier_doc_fixes' of git://git...

[noreply at github.com]

Branch: refs/heads/master
Home:   http://github.com/djmitche/buildbot

Commit: 2d97c095d334f94d486aaa0ca7089e5a09a764b6
    http://github.com/djmitche/buildbot/commit/2d97c095d334f94d486aaa0ca7089e5a09a764b6
Author: Dustin J. Mitchell <dustin at zmanda.com>
Date:   2010-06-26 (Sat, 26 Jun 2010)

Changed paths:
  M docs/cfg-statustargets.texinfo

Log Message:
-----------
Merge branch 'mailnotifier_doc_fixes' of git://github.com/garetharmstronghp/buildbot

* 'mailnotifier_doc_fixes' of git://github.com/garetharmstronghp/buildbot:
  Documentation fixes for MailNotifier, remove reference to asHTML method


Commit: 5f9d55d79a773be07e50145a77fdb31781e63065
    http://github.com/djmitche/buildbot/commit/5f9d55d79a773be07e50145a77fdb31781e63065
Author: Dustin J. Mitchell <dustin at zmanda.com>
Date:   2010-06-26 (Sat, 26 Jun 2010)

Changed paths:
  M slave/buildslave/commands/base.py

Log Message:
-----------
Merge branch 'fix_git_retries' of git://github.com/ScottGarman/buildbot

* 'fix_git_retries' of git://github.com/ScottGarman/buildbot:
  base.by: maybeDoVCFallback() should also be called on error