[Buildbot-commits] [buildbot/buildbot] aa8b33: fix typo

[noreply at github.com]

Branch: refs/heads/master
Home:   https://github.com/buildbot/buildbot

Commit: aa8b338391ae40e6a8def7d900a764936ec7e82a
    https://github.com/buildbot/buildbot/commit/aa8b338391ae40e6a8def7d900a764936ec7e82a
Author: Dustin J. Mitchell <dustin at mozilla.com>
Date:   2011-03-15 (Tue, 15 Mar 2011)

Changed paths:
  M master/buildbot/master.py

Log Message:
-----------
fix typo


Commit: eb5a3ea238c5293c9932c001246545c854f63811
    https://github.com/buildbot/buildbot/commit/eb5a3ea238c5293c9932c001246545c854f63811
Author: Lital Natan <litaln at Lital-Natans-MacBook-Pro.local>
Date:   2011-03-15 (Tue, 15 Mar 2011)

Changed paths:
  M master/buildbot/buildslave.py

Log Message:
-----------
fix-1817-4 fix default timeout to be 1 hour instead of 6 minutes


Commit: 72f2cfa9c6c7cbbd92cdf5fce019e8e44714a510
    https://github.com/buildbot/buildbot/commit/72f2cfa9c6c7cbbd92cdf5fce019e8e44714a510
Author: Lital Natan <litaln at Lital-Natans-MacBook-Pro.local>
Date:   2011-03-15 (Tue, 15 Mar 2011)

Changed paths:
  M master/docs/cfg-buildslaves.texinfo

Log Message:
-----------
fix-1817-5 added documentation for keepalive_interval


Commit: 1a77dbc4ca47d369c15c354e04e12294487e0686
    https://github.com/buildbot/buildbot/commit/1a77dbc4ca47d369c15c354e04e12294487e0686
Author: Dustin J. Mitchell <dustin at mozilla.com>
Date:   2011-03-15 (Tue, 15 Mar 2011)

Changed paths:
  M master/buildbot/buildslave.py
  M master/docs/cfg-buildslaves.texinfo

Log Message:
-----------
Merge branch 'fix-1817' of git://github.com/smackware/buildbot

* 'fix-1817' of git://github.com/smackware/buildbot:
  fix-1817-5 added documentation for keepalive_interval
  fix-1817-4 fix default timeout to be 1 hour instead of 6 minutes
  fix-1817-3 minor fixes and modifications
  fix-1817-2 keepalive interval can be set during BuildSlave instantiation
  fix-1817-1 more appropriate use of start/stopKeepaliveTimer
  fix for 1817, add simple keepalive timer from master to bot slaves

Minor documentation edits by me.  Fixes #1817.


Compare: https://github.com/buildbot/buildbot/compare/669354a...1a77dbc