[Buildbot-commits] [buildbot/buildbot] 596ade: Git: Don't break when there is a file called `FETC...

Wed Nov 21 22:58:40 UTC 2012

  Branch: refs/heads/master
  Home:   https://github.com/buildbot/buildbot
  Commit: 596ade90699e519027d4bedcd1407b95db34e08a
      https://github.com/buildbot/buildbot/commit/596ade90699e519027d4bedcd1407b95db34e08a
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-10-04 (Thu, 04 Oct 2012)

  Changed paths:
    M master/buildbot/steps/source/git.py
    M master/buildbot/test/unit/test_steps_source_git.py
    M master/docs/release-notes.rst

  Log Message:
  -----------
  Git: Don't break when there is a file called `FETCH_HEAD`.

We want to refer to the branch FETCH_HEAD, not a file, so let git know that.
(Reported by loul2 on #buildbot)

  Commit: 2d70173107900fdcca187d00ee991b6b165180bb
      https://github.com/buildbot/buildbot/commit/2d70173107900fdcca187d00ee991b6b165180bb
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-10-04 (Thu, 04 Oct 2012)

  Changed paths:
    M master/buildbot/changes/gitpoller.py
    M master/buildbot/test/unit/test_changes_gitpoller.py

  Log Message:
  -----------
  GitPoller: Disambiguate versions from file names.

The revision that we use for GitPoller are probably never going to exists
as files, but it doesn't cost us anything to avoid issues here.

  Commit: 48dd290899711ab7db3915a67cec442e2d3e5f42
      https://github.com/buildbot/buildbot/commit/48dd290899711ab7db3915a67cec442e2d3e5f42
  Author: Dan Kegel <dank at kegel.com>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M master/buildbot/scripts/sample.cfg

  Log Message:
  -----------
  Update pyflakes project url.  divmod.org says it's offline, and to use launchpad instead.

  Commit: cfa834b9d03fc3fe9fad7ab04587a939969dd609
      https://github.com/buildbot/buildbot/commit/cfa834b9d03fc3fe9fad7ab04587a939969dd609
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-10-29 (Mon, 29 Oct 2012)

  Changed paths:
    M master/buildbot/status/build.py

  Log Message:
  -----------
  Fix BuildStatus.getAllGotRevisions to properly handle vcs that use int.

Fixes #2388, #2380.

  Commit: 126e02341c76bd5a027c2ca5a8467aa5708228f2
      https://github.com/buildbot/buildbot/commit/126e02341c76bd5a027c2ca5a8467aa5708228f2
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-10-31 (Wed, 31 Oct 2012)

  Changed paths:
    M master/buildbot/test/__init__.py

  Log Message:
  -----------
  Raise ImportError instead of exiting, if buildbot.test can't be imported.

This apparently causes issue with 'pydoc -k', and is in general not nice.
Trial still fails with a sensible error message.

  Commit: 0b098b9de7dcf8275ab402ef5988cba1578ddf5d
      https://github.com/buildbot/buildbot/commit/0b098b9de7dcf8275ab402ef5988cba1578ddf5d
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-10-31 (Wed, 31 Oct 2012)

  Changed paths:
    M master/buildbot/test/__init__.py

  Log Message:
  -----------
  Make pyflakes happy.

  Commit: 2ea7aa34e55f0878763e3ad92b8dd68cc95e7cbc
      https://github.com/buildbot/buildbot/commit/2ea7aa34e55f0878763e3ad92b8dd68cc95e7cbc
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-11-02 (Fri, 02 Nov 2012)

  Changed paths:
    M master/buildbot/steps/slave.py
    M master/buildbot/test/unit/test_steps_slave.py
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  SetPropertiesFromEnv: Use properties from slave, rather than set on master.

The old implementation incorrectly used the set of environment variables set
on the master, rather than those retrieved from the slave, when setting properties.

Fixes #2393.

  Commit: 2a8afa42777ab481ef7fa32d8e5c67d235db70cd
      https://github.com/buildbot/buildbot/commit/2a8afa42777ab481ef7fa32d8e5c67d235db70cd
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-11-02 (Fri, 02 Nov 2012)

  Changed paths:
    M master/buildbot/test/unit/test_steps_slave.py

  Log Message:
  -----------
  SetPropertiesFromEnv: Properties from the slave will always be strings.

So the tests should use strings there too.

  Commit: ac294a5552d1d12b0fd37a323061e122f56bec9b
      https://github.com/buildbot/buildbot/commit/ac294a5552d1d12b0fd37a323061e122f56bec9b
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-11-02 (Fri, 02 Nov 2012)

  Changed paths:
    M master/buildbot/steps/slave.py
    M master/buildbot/test/unit/test_steps_slave.py
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  SetPropertiesFromEnv: Log property changes.

Fixes #2361.

  Commit: ea150eb1004637a2fedb5b21f5381b0dbc8b9124
      https://github.com/buildbot/buildbot/commit/ea150eb1004637a2fedb5b21f5381b0dbc8b9124
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-11-02 (Fri, 02 Nov 2012)

  Changed paths:
    M master/buildbot/steps/slave.py
    M master/buildbot/test/unit/test_steps_slave.py
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  Merge branch 'log-env' into buildbot-0.8.7

  Commit: ebb2ff9154680b372775fdcc3f3e7d6a410c7b53
      https://github.com/buildbot/buildbot/commit/ebb2ff9154680b372775fdcc3f3e7d6a410c7b53
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-11-02 (Fri, 02 Nov 2012)

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

  Log Message:
  -----------
  Make sphinx happy.

  Commit: 3cef8ba0fae3b902bdb28f6a952827cf4f08ccb7
      https://github.com/buildbot/buildbot/commit/3cef8ba0fae3b902bdb28f6a952827cf4f08ccb7
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-11-02 (Fri, 02 Nov 2012)

  Changed paths:
    M master/buildbot/steps/source/git.py
    M master/buildbot/test/unit/test_steps_source_git.py
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  Git: Fix cloning with default branch.

``git`` doesn't like it when we specify the default ``HEAD`` to ``git-clone``
using ``--branch``.

  Commit: 95ccb18a5dc8d667f154b82abcfb32862961437d
      https://github.com/buildbot/buildbot/commit/95ccb18a5dc8d667f154b82abcfb32862961437d
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-11-02 (Fri, 02 Nov 2012)

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

  Log Message:
  -----------
  Git: Document that not specifying a branch gets the default remote branch.

This has been the behaviour since 0.8.6, so fix the documentation to match.

Refs #1773.

  Commit: 4e714cb92bf693e21d2b65df6483f91c0c9fc3d7
      https://github.com/buildbot/buildbot/commit/4e714cb92bf693e21d2b65df6483f91c0c9fc3d7
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2012-11-05 (Mon, 05 Nov 2012)

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

  Log Message:
  -----------
  add relnotes about no longer supporting multi-argument addStep

  Commit: f78a687cad45d2711dca40534a0580eac6b9b289
      https://github.com/buildbot/buildbot/commit/f78a687cad45d2711dca40534a0580eac6b9b289
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2012-11-05 (Mon, 05 Nov 2012)

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

  Log Message:
  -----------
  proper link to old versions' release notes

  Commit: 92b0d1f272d2d484c3e3b983af6ded38cbe75daa
      https://github.com/buildbot/buildbot/commit/92b0d1f272d2d484c3e3b983af6ded38cbe75daa
  Author: Malcolm Parsons <malcolm.parsons at gmail.com>
  Date:   2012-11-15 (Thu, 15 Nov 2012)

  Changed paths:
    M master/buildbot/steps/source/mercurial.py
    M master/buildbot/test/unit/test_steps_source_mercurial.py

  Log Message:
  -----------
  Fix Mercurial to update to specified branch

With inrepo branches the Mercurial master side source steps
did not update to the specified branch when no revision was specified.

  Commit: 77cf416596c2665ce9dec60c888e3d5c1b204d3d
      https://github.com/buildbot/buildbot/commit/77cf416596c2665ce9dec60c888e3d5c1b204d3d
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2012-11-15 (Thu, 15 Nov 2012)

  Changed paths:
    M master/buildbot/steps/source/mercurial.py
    M master/buildbot/test/unit/test_steps_source_mercurial.py

  Log Message:
  -----------
  Merge branch 'mercurialbranch' of git://github.com/pepsiman/buildbot into buildbot-0.8.7

  Commit: 4071a7971c900a00e6c3385ff3a9f36b126b0291
      https://github.com/buildbot/buildbot/commit/4071a7971c900a00e6c3385ff3a9f36b126b0291
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-11-17 (Sat, 17 Nov 2012)

  Changed paths:
    M master/buildbot/steps/source/git.py
    M master/buildbot/test/unit/test_steps_source_git.py
    M master/docs/manual/cfg-buildsteps.rst
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  Merge branch 'git-HEAD-clone' into buildbot-0.8.7

  Commit: 05f0f0f312f003510740236972a5027b8eef98b3
      https://github.com/buildbot/buildbot/commit/05f0f0f312f003510740236972a5027b8eef98b3
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-11-17 (Sat, 17 Nov 2012)

  Changed paths:
    M master/buildbot/changes/gitpoller.py
    M master/buildbot/steps/source/git.py
    M master/buildbot/test/unit/test_changes_gitpoller.py
    M master/buildbot/test/unit/test_steps_source_git.py
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  Merge branch 'git-disamiguate' into buildbot-0.8.7

  Commit: efc3b6853ab7b03ba35de5820292a8bd7de96596
      https://github.com/buildbot/buildbot/commit/efc3b6853ab7b03ba35de5820292a8bd7de96596
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-11-19 (Mon, 19 Nov 2012)

  Changed paths:
    M master/buildbot/scripts/start.py
    M master/buildbot/test/unit/test_scripts_start.py
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  start: Don't fork when not daemonizing.

The reason not to fork, is to make it easier for process monitors
to manage. Forking subverts that.

  Commit: 59ad1152b155a40c20bbbee8fe4ec591ef1009d9
      https://github.com/buildbot/buildbot/commit/59ad1152b155a40c20bbbee8fe4ec591ef1009d9
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-11-19 (Mon, 19 Nov 2012)

  Changed paths:
    M master/buildbot/scripts/start.py
    M master/buildbot/test/unit/test_scripts_start.py

  Log Message:
  -----------
  start: Don't fork python, when starting buildbot.

This changes 'buildbot start' to use spawnProcess instead of fork
to start the buildbot process. This should avoid the odd behaviour
sometimes seen when starting up.

Fixes #1992.

  Commit: 154a6e4260bf0b51b3ab8df70ce44a06aee28410
      https://github.com/buildbot/buildbot/commit/154a6e4260bf0b51b3ab8df70ce44a06aee28410
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-11-19 (Mon, 19 Nov 2012)

  Changed paths:
    M master/buildbot/scripts/start.py
    M master/buildbot/test/unit/test_scripts_start.py
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  Merge pull request #576 from tomprince/bug1992

Don't fork python, when starting buildbot.

  Commit: 4a63073296b520b0ae7eda7b9c19500cccc2a362
      https://github.com/buildbot/buildbot/commit/4a63073296b520b0ae7eda7b9c19500cccc2a362
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-11-19 (Mon, 19 Nov 2012)

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

  Log Message:
  -----------
  fix pyflakes

  Commit: f27e7c995ad12dc4e94285546cc0352a88eb0510
      https://github.com/buildbot/buildbot/commit/f27e7c995ad12dc4e94285546cc0352a88eb0510
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-11-19 (Mon, 19 Nov 2012)

  Changed paths:
    M master/buildbot/test/unit/test_scripts_start.py

  Log Message:
  -----------
  Skip failing 'buildbot start' tests on 9.0.0.

These tests are going to change soon anyway, when we get better log following.

  Commit: 9eb0c99ba2b99574e0ba707809fcc320bd46d9d1
      https://github.com/buildbot/buildbot/commit/9eb0c99ba2b99574e0ba707809fcc320bd46d9d1
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-11-19 (Mon, 19 Nov 2012)

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

  Log Message:
  -----------
  Update release notes.

  Commit: 57c6b171b32e6d49d744302ce00f2b38edbfc649
      https://github.com/buildbot/buildbot/commit/57c6b171b32e6d49d744302ce00f2b38edbfc649
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M master/buildbot/test/unit/test_steps_trigger.py

  Log Message:
  -----------
  Make Trigger tests use an ITriggerableScheduler, instead of a Triggerable subclass.

  Commit: b2b4c237cf8f8fd2091442aed9c323b3a5fbbaf9
      https://github.com/buildbot/buildbot/commit/b2b4c237cf8f8fd2091442aed9c323b3a5fbbaf9
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M master/buildbot/test/unit/test_steps_trigger.py

  Log Message:
  -----------
  Remove unsued arguments to FakeSourceStamp in trigger tests.

  Commit: e8169fbb0f55264c0fec8295efeccfddb0c2f3e3
      https://github.com/buildbot/buildbot/commit/e8169fbb0f55264c0fec8295efeccfddb0c2f3e3
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M master/buildbot/test/unit/test_steps_trigger.py

  Log Message:
  -----------
  test_step_trigger: Simplify setupStep arguments.

Rather than taking an arbitrary set of keyword arguments and modifying it,
just take the argument explicitly.

  Commit: 8148b1bbbebbcb06b67492bb962a81f08bf2a647
      https://github.com/buildbot/buildbot/commit/8148b1bbbebbcb06b67492bb962a81f08bf2a647
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M master/buildbot/steps/trigger.py
    M master/buildbot/test/unit/test_steps_trigger.py
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  Trigger: Ignore sourcestamp from build if ``sourceStamps`` is set.

This was mistakenly changed in 0.8.7.

  Commit: a76dcc474e2b8b5fcf3ec41495c79a9b6fe345cd
      https://github.com/buildbot/buildbot/commit/a76dcc474e2b8b5fcf3ec41495c79a9b6fe345cd
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M master/buildbot/steps/trigger.py
    M master/buildbot/test/unit/test_steps_trigger.py
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  Trigger: Make ``alwaysUseLatest`` ignore current builds source stamps.

  Commit: 8ba7008c0e041c6ecc4b23184a46faae7e6f62fa
      https://github.com/buildbot/buildbot/commit/8ba7008c0e041c6ecc4b23184a46faae7e6f62fa
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M master/buildbot/steps/trigger.py
    M master/buildbot/test/unit/test_steps_trigger.py

  Log Message:
  -----------
  Trigger: Use BuildStatus.getAllGotRevisions.

This logic was a duplicate of logic elsewhere.

  Commit: beff5a03169d7b80f10f9fabd183765c3ec39def
      https://github.com/buildbot/buildbot/commit/beff5a03169d7b80f10f9fabd183765c3ec39def
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M master/buildbot/schedulers/base.py
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  Properly accept changes, when creating buildsets for source stamp lists.

Fixes #2376.

  Commit: e270a2c7b034fbe68dec43d94dd67d75084a968f
      https://github.com/buildbot/buildbot/commit/e270a2c7b034fbe68dec43d94dd67d75084a968f
  Author: Malcolm Parsons <malcolm.parsons at gmail.com>
  Date:   2012-11-21 (Wed, 21 Nov 2012)

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

  Log Message:
  -----------
  Fix get_compatible_builds example

  Commit: b7c9a0f0ed0ed0e9a76ea0cbe5ce1500c6d2752a
      https://github.com/buildbot/buildbot/commit/b7c9a0f0ed0ed0e9a76ea0cbe5ce1500c6d2752a
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2012-11-21 (Wed, 21 Nov 2012)

  Changed paths:
    M master/buildbot/status/mail.py

  Log Message:
  -----------
  Use 'replace' when decoding logfiles as UTF-8

Since logfiles may not be in UTF-8, and may in fact not be in any
particular encoding, this is reasonable.  Refs #2373.

  Commit: 0d5a70c586d49d86a561e4f0f63ca44d813637c0
      https://github.com/buildbot/buildbot/commit/0d5a70c586d49d86a561e4f0f63ca44d813637c0
  Author: Florin Dinu <contact at florindinu.ro>
  Date:   2012-11-21 (Wed, 21 Nov 2012)

  Changed paths:
    M master/buildbot/changes/hgpoller.py

  Log Message:
  -----------
  HgPoller breaks with invalid UTF-8 hg output

If there are invalid UTF-8 characters in Mercurial's output, HgPoller
will raise an error. Invalid characters can most likely come from
commit messages.

It should use errors="replace" when decoding the output so
it handles things gracefully.

  Commit: 2df815cc2692e86f07db01d0ce7741c1828e4e19
      https://github.com/buildbot/buildbot/commit/2df815cc2692e86f07db01d0ce7741c1828e4e19
  Author: Benoît Allard <benoit.allard at gmx.de>
  Date:   2012-11-21 (Wed, 21 Nov 2012)

  Changed paths:
    M master/docs/manual/concepts.rst

  Log Message:
  -----------
  Add note about source steps having their own workdir when working with multiple codebases.

Addition suggested by confusion on the mailing list.

  Commit: 46a89241935f7dc090f9ce72b767f3841cc800fa
      https://github.com/buildbot/buildbot/commit/46a89241935f7dc090f9ce72b767f3841cc800fa
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2012-11-21 (Wed, 21 Nov 2012)

  Changed paths:
    M master/buildbot/changes/hgpoller.py

  Log Message:
  -----------
  fix decode call

  Commit: fa43f2df85e8e70e37dd7e42eec7bc5d70bbad33
      https://github.com/buildbot/buildbot/commit/fa43f2df85e8e70e37dd7e42eec7bc5d70bbad33
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2012-11-21 (Wed, 21 Nov 2012)

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

  Log Message:
  -----------
  fix docs for getSourceStamp -> getSourceStamps; fixes #2397

  Commit: 41914a097a6287b2188aad8c0e5cda375c148ea9
      https://github.com/buildbot/buildbot/commit/41914a097a6287b2188aad8c0e5cda375c148ea9
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2012-11-21 (Wed, 21 Nov 2012)

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

  Log Message:
  -----------
  fix typos in class names

  Commit: 2678d4dedc46eab0f68a27c6f79056c73a475b83
      https://github.com/buildbot/buildbot/commit/2678d4dedc46eab0f68a27c6f79056c73a475b83
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2012-11-21 (Wed, 21 Nov 2012)

  Changed paths:
    M master/buildbot/process/botmaster.py

  Log Message:
  -----------
  only catch Exception, and specifically not GeneratorExit, inside inlineCallbacks

Refs #2395.

  Commit: 062402b79e5fc77f509b7726d2cfac7d84332e20
      https://github.com/buildbot/buildbot/commit/062402b79e5fc77f509b7726d2cfac7d84332e20
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2012-11-21 (Wed, 21 Nov 2012)

  Changed paths:
    M master/docs/manual/cfg-builders.rst
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  Document that nextSlave can return a Deferred

  Commit: 347345a368e8ea20a4308c1fbb9b10bc24817769
      https://github.com/buildbot/buildbot/commit/347345a368e8ea20a4308c1fbb9b10bc24817769
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-11-21 (Wed, 21 Nov 2012)

  Changed paths:
    M master/buildbot/schedulers/base.py
    M master/buildbot/steps/trigger.py
    M master/buildbot/test/unit/test_steps_trigger.py
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  Merge branch 'bug2376' into buildbot-0.8.7

Conflicts:
	master/docs/relnotes/index.rst

  Commit: e4be67dba135ed6acbf6a41a65293ae7fa0fe5a8
      https://github.com/buildbot/buildbot/commit/e4be67dba135ed6acbf6a41a65293ae7fa0fe5a8
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-11-21 (Wed, 21 Nov 2012)

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

  Log Message:
  -----------
  Release notes updates.

  Commit: 233f4e9a8ef81a820cb3a14ccae83797c699125c
      https://github.com/buildbot/buildbot/commit/233f4e9a8ef81a820cb3a14ccae83797c699125c
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-11-21 (Wed, 21 Nov 2012)

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

  Log Message:
  -----------
  Add release date for 0.8.7p1.

  Commit: 11f2d2d29d2e23dec9ee4f0329ad67e918d676bb
      https://github.com/buildbot/buildbot/commit/11f2d2d29d2e23dec9ee4f0329ad67e918d676bb
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-11-21 (Wed, 21 Nov 2012)

  Changed paths:
    M master/buildbot/changes/gitpoller.py
    M master/buildbot/schedulers/base.py
    M master/buildbot/scripts/start.py
    M master/buildbot/status/build.py
    M master/buildbot/steps/slave.py
    M master/buildbot/steps/source/git.py
    M master/buildbot/steps/source/mercurial.py
    M master/buildbot/steps/trigger.py
    M master/buildbot/test/__init__.py
    M master/buildbot/test/unit/test_changes_gitpoller.py
    M master/buildbot/test/unit/test_scripts_start.py
    M master/buildbot/test/unit/test_steps_slave.py
    M master/buildbot/test/unit/test_steps_source_git.py
    M master/buildbot/test/unit/test_steps_source_mercurial.py
    M master/buildbot/test/unit/test_steps_trigger.py
    M master/docs/manual/cfg-buildsteps.rst
    M master/docs/relnotes/0.8.7.rst
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  Merge branch 'buildbot-0.8.7'

Conflicts:
	master/buildbot/steps/slave.py
	master/buildbot/test/unit/test_steps_slave.py
	master/docs/relnotes/index.rst

Compare: https://github.com/buildbot/buildbot/compare/a4e88d1ce995...11f2d2d29d2e