[Buildbot-commits] [buildbot/buildbot] 8db7e5: Merge commit 'ba29d78' into pull280

[noreply at github.com]

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

  Commit: 8db7e5b56671cc098c8f8b470efaa9c48b16178a
      https://github.com/buildbot/buildbot/commit/8db7e5b56671cc098c8f8b470efaa9c48b16178a
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2011-12-29 (Thu, 29 Dec 2011)

  Changed paths:
    M master/buildbot/config.py
  A master/buildbot/revlinks.py
  M master/buildbot/status/web/baseweb.py
  M master/buildbot/test/unit/test_config.py
  A master/buildbot/test/unit/test_revlinks.py
  M master/docs/manual/cfg-changesources.rst
  M master/docs/manual/cfg-global.rst
  M master/docs/manual/cfg-statustargets.rst

  Log Message:
  -----------
  Merge commit 'ba29d78' into pull280

* commit 'ba29d78':
  revlink: Add documentation and tests for revlink helpers.
  Minor edits to documentation, pyflakes fix in test_revlinks.py.
  Document that c['revlink'] has a reasonable deafult.
  Move documentation of revlink option to global options list.
  Document that the SVNPoller argument revlinktmpl is deprecated.
  Use default_revlink_matcher.
  Move buildbot.status.revlinks to buildbot.revlinks.
  Implement some default revlink functions.

Conflicts:
	master/buildbot/config.py


  Commit: c233871bf3728ec2fc355fefe6680d6f95224a25
      https://github.com/buildbot/buildbot/commit/c233871bf3728ec2fc355fefe6680d6f95224a25
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2011-12-29 (Thu, 29 Dec 2011)

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

  Log Message:
  -----------
  fix up docs


  Commit: f8b03674defe517ed79d00d01ecd0efe90abb48e
      https://github.com/buildbot/buildbot/commit/f8b03674defe517ed79d00d01ecd0efe90abb48e
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2011-12-29 (Thu, 29 Dec 2011)

  Changed paths:
    M master/docs/release-notes.rst

  Log Message:
  -----------
  release notes for revlinks


  Commit: 1f6193aa5b6d49bd107046383ff6a37216494dee
      https://github.com/buildbot/buildbot/commit/1f6193aa5b6d49bd107046383ff6a37216494dee
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2011-12-29 (Thu, 29 Dec 2011)

  Changed paths:
    M master/buildbot/config.py
  A master/buildbot/revlinks.py
  M master/buildbot/status/web/baseweb.py
  M master/buildbot/test/unit/test_config.py
  A master/buildbot/test/unit/test_revlinks.py
  M master/docs/manual/cfg-changesources.rst
  M master/docs/manual/cfg-global.rst
  M master/docs/manual/cfg-statustargets.rst
  M master/docs/release-notes.rst

  Log Message:
  -----------
  Merge branch 'pull280'

* pull280:
  release notes for revlinks
  fix up docs
  revlink: Add documentation and tests for revlink helpers.
  Minor edits to documentation, pyflakes fix in test_revlinks.py.
  Document that c['revlink'] has a reasonable deafult.
  Move documentation of revlink option to global options list.
  Document that the SVNPoller argument revlinktmpl is deprecated.
  Use default_revlink_matcher.
  Move buildbot.status.revlinks to buildbot.revlinks.
  Implement some default revlink functions.


Compare: https://github.com/buildbot/buildbot/compare/d8d2331...1f6193a