[Buildbot-commits] [buildbot/buildbot] 5a4869: Extend the reconfig timer when certain progress li...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/buildbot/buildbot
  Commit: 5a4869c84dc011c17e63c06b67fb7ba771fc6713
      https://github.com/buildbot/buildbot/commit/5a4869c84dc011c17e63c06b67fb7ba771fc6713
  Author: Jared Grubb <jgrubb at apple.com>
  Date:   2013-05-04 (Sat, 04 May 2013)

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

  Log Message:
  -----------
  Extend the reconfig timer when certain progress lines are seen


  Commit: 5424db66701b14abdc611ca64aa997ff04a949ce
      https://github.com/buildbot/buildbot/commit/5424db66701b14abdc611ca64aa997ff04a949ce
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-05-04 (Sat, 04 May 2013)

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

  Log Message:
  -----------
  Merge branch 'ExtendReconfig' of git://github.com/jaredgrubb/buildbot
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.

# Please enter the commit message for your changes. Lines starting
# with '#' will be kept; you may remove them yourself if you want to.
# An empty message aborts the commit.
# On branch master
# All conflicts fixed but you are still merging.
#   (use "git commit" to conclude merge)
#
# Changes to be committed:
#
#	modified:   master/buildbot/scripts/logwatcher.py
#


  Commit: c19cc825d7a46b12741bfad35288d2926ce4a2f5
      https://github.com/buildbot/buildbot/commit/c19cc825d7a46b12741bfad35288d2926ce4a2f5
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-05-04 (Sat, 04 May 2013)

  Changed paths:
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  add relnotes for previous


Compare: https://github.com/buildbot/buildbot/compare/f9c9c9579615...c19cc825d7a4