[Buildbot-commits] [buildbot/buildbot] b5f24d: Fix merge #2.

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/buildbot/buildbot
  Commit: b5f24dfe082ed2b779c4b3279242416f28edb301
      https://github.com/buildbot/buildbot/commit/b5f24dfe082ed2b779c4b3279242416f28edb301
  Author: Edmund Wong <ewongbb at pw-wspx.org>
  Date:   2015-03-29 (Sun, 29 Mar 2015)

  Changed paths:
    M master/docs/examples/hello.cfg
    M master/docs/examples/twisted_master.cfg
    M master/docs/manual/cfg-buildfactories.rst
    M master/docs/manual/cfg-buildsteps.rst
    M master/docs/manual/cfg-changesources.rst
    M master/docs/manual/cfg-interlocks.rst
    M master/docs/manual/cfg-statustargets.rst
    M master/docs/manual/concepts.rst
    M master/docs/manual/customization.rst
    M master/docs/tutorial/fiveminutes.rst

  Log Message:
  -----------
  Fix merge #2.


  Commit: 8e9baf96bfefa13dd7e5a8dbb1728c8dbd9668ef
      https://github.com/buildbot/buildbot/commit/8e9baf96bfefa13dd7e5a8dbb1728c8dbd9668ef
  Author: Edmund Wong <ewongbb at pw-wspx.org>
  Date:   2015-03-29 (Sun, 29 Mar 2015)

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

  Log Message:
  -----------
  Added relnote to document the change.


  Commit: 207a141de4c1b80dd6bb94f739e308cac8fc0d10
      https://github.com/buildbot/buildbot/commit/207a141de4c1b80dd6bb94f739e308cac8fc0d10
  Author: Mikhail Sobolev <mss at mawhrin.net>
  Date:   2015-04-01 (Wed, 01 Apr 2015)

  Changed paths:
    M master/docs/examples/hello.cfg
    M master/docs/examples/twisted_master.cfg
    M master/docs/manual/cfg-buildfactories.rst
    M master/docs/manual/cfg-buildsteps.rst
    M master/docs/manual/cfg-changesources.rst
    M master/docs/manual/cfg-interlocks.rst
    M master/docs/manual/cfg-statustargets.rst
    M master/docs/manual/concepts.rst
    M master/docs/manual/customization.rst
    M master/docs/relnotes/index.rst
    M master/docs/tutorial/fiveminutes.rst

  Log Message:
  -----------
  Merge pull request #1595 from ewongbb/ticket2944_2

Change svnurl to repourl in SVNPoller() - doc changes


Compare: https://github.com/buildbot/buildbot/compare/e8b0624f3211...207a141de4c1