[Buildbot-commits] [buildbot/buildbot] 7d0ae2: Don't use deprecated branch= in sample config

[noreply at github.com]

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

  Commit: 7d0ae25980aac9da3aabd809dc48f4c7a3e02c68
      https://github.com/buildbot/buildbot/commit/7d0ae25980aac9da3aabd809dc48f4c7a3e02c68
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2011-08-20 (Sat, 20 Aug 2011)

  Changed paths:
    M master/buildbot/scripts/sample.cfg
  A master/buildbot/test/integration/test_configs.py
  M master/docs/manual/cfg-schedulers.rst

  Log Message:
  -----------
  Don't use deprecated branch= in sample config

This also adds a test to make sure the sample config still works, and
fixes the documentation to not use the deprecated parameter.
Fixes #2080.


  Commit: 1bccd7b811bbe9b51187c09716de0a3c05f428a6
      https://github.com/buildbot/buildbot/commit/1bccd7b811bbe9b51187c09716de0a3c05f428a6
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2011-08-20 (Sat, 20 Aug 2011)

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

  Log Message:
  -----------
  document all ChangeFilter parameters explicitly

Fixes #2079.


  Commit: 2fc90f01ba845db05f804d3d7e969a2b72a95da4
      https://github.com/buildbot/buildbot/commit/2fc90f01ba845db05f804d3d7e969a2b72a95da4
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2011-08-20 (Sat, 20 Aug 2011)

  Changed paths:
    M slave/NEWS
  M slave/buildslave/commands/p4.py
  M slave/buildslave/test/fake/runprocess.py
  M slave/buildslave/test/unit/test_commands_p4.py

  Log Message:
  -----------
  Be consistent about string handling in Perforce's sourcedata string

Fixes #2040.


  Commit: fba7b635999cb90783dabe6dc618c711102b4c98
      https://github.com/buildbot/buildbot/commit/fba7b635999cb90783dabe6dc618c711102b4c98
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2011-08-20 (Sat, 20 Aug 2011)

  Changed paths:
    M master/buildbot/scripts/sample.cfg
  A master/buildbot/test/integration/test_configs.py
  M master/docs/manual/cfg-schedulers.rst
  M slave/NEWS
  M slave/buildslave/commands/p4.py
  M slave/buildslave/test/fake/runprocess.py
  M slave/buildslave/test/unit/test_commands_p4.py

  Log Message:
  -----------
  Merge remote-tracking branch 'lorentz/master'

* lorentz/master:
  Be consistent about string handling in Perforce's sourcedata string
  document all ChangeFilter parameters explicitly
  Don't use deprecated branch= in sample config


Compare: https://github.com/buildbot/buildbot/compare/54068be...fba7b63