[Buildbot-commits] [buildbot/buildbot] 2d5dab: update customization.rst from nine

[GitHub]

  Branch: refs/heads/nine
  Home:   https://github.com/buildbot/buildbot
  Commit: 2d5dab253d9c079df1b65fcf5017f30777e7af98
      https://github.com/buildbot/buildbot/commit/2d5dab253d9c079df1b65fcf5017f30777e7af98
  Author: Dustin J. Mitchell <dustin at buildbot.net>
  Date:   2014-05-26 (Mon, 26 May 2014)

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

  Log Message:
  -----------
  update customization.rst from nine


  Commit: f659976cde22ce734b8b10f33d5d8373e72eb9d9
      https://github.com/buildbot/buildbot/commit/f659976cde22ce734b8b10f33d5d8373e72eb9d9
  Author: Dustin J. Mitchell <dustin at buildbot.net>
  Date:   2014-05-26 (Mon, 26 May 2014)

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

  Log Message:
  -----------
  mention another way to get command output


  Commit: 9a4fb67c8a1554b52213adf86edc7865f3b500a5
      https://github.com/buildbot/buildbot/commit/9a4fb67c8a1554b52213adf86edc7865f3b500a5
  Author: Dustin J. Mitchell <dustin at buildbot.net>
  Date:   2014-05-26 (Mon, 26 May 2014)

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

  Log Message:
  -----------
  'steps', not 'tests'.  Similar letters, different words


  Commit: 03122b48a41cfee9a4e738f3d779212705f9d7da
      https://github.com/buildbot/buildbot/commit/03122b48a41cfee9a4e738f3d779212705f9d7da
  Author: Dustin J. Mitchell <dustin at buildbot.net>
  Date:   2014-05-26 (Mon, 26 May 2014)

  Changed paths:
    M master/buildbot/process/buildstep.py
    M master/docs/manual/customization.rst

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


  Commit: 98ee61511d46862b460f607c5580bfbc0b185d6b
      https://github.com/buildbot/buildbot/commit/98ee61511d46862b460f607c5580bfbc0b185d6b
  Author: Dustin J. Mitchell <dustin at buildbot.net>
  Date:   2014-05-26 (Mon, 26 May 2014)

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

  Log Message:
  -----------
  Merge branch 'master' into nine

Conflicts:
	master/buildbot/process/buildstep.py


  Commit: 05ef1d26662f6b7b86167f854e2361a39adcdb14
      https://github.com/buildbot/buildbot/commit/05ef1d26662f6b7b86167f854e2361a39adcdb14
  Author: Dustin J. Mitchell <dustin at buildbot.net>
  Date:   2014-05-26 (Mon, 26 May 2014)

  Changed paths:
    M master/buildbot/process/buildstep.py
    M master/buildbot/test/unit/test_process_log.py
    M master/docs/manual/new-style-steps.rst

  Log Message:
  -----------
  (more) 'steps', not 'tests'.  Similar letters, different words


Compare: https://github.com/buildbot/buildbot/compare/da12d23f244f...05ef1d26662f