[Buildbot-commits] [buildbot/buildbot] 65e23b: Docs: add an 'import' in one spot to make the reci...

[GitHub]

  Branch: refs/heads/nine
  Home:   https://github.com/buildbot/buildbot
  Commit: 65e23b2e4cc3df3e2242c72545496c56cd940027
      https://github.com/buildbot/buildbot/commit/65e23b2e4cc3df3e2242c72545496c56cd940027
  Author: Jared Grubb <jaredgrubb at gmail.com>
  Date:   2014-03-01 (Sat, 01 Mar 2014)

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

  Log Message:
  -----------
  Docs: add an 'import' in one spot to make the recipe easier to swallow


  Commit: 9592059fe62c8d94ce066c313c220f0bcd8a23a9
      https://github.com/buildbot/buildbot/commit/9592059fe62c8d94ce066c313c220f0bcd8a23a9
  Author: Dustin J. Mitchell <dustin at v.igoro.us>
  Date:   2014-03-01 (Sat, 01 Mar 2014)

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

  Log Message:
  -----------
  Merge pull request #1081 from jaredgrubb/doc-props-add-import

Docs: add an 'import' in one spot to make the recipe easier to swallow


  Commit: e3df261c03bc176761e21bbb66874127d357638f
      https://github.com/buildbot/buildbot/commit/e3df261c03bc176761e21bbb66874127d357638f
  Author: Kálmán Viktor <kviktor at cloud.bme.hu>
  Date:   2014-03-01 (Sat, 01 Mar 2014)

  Changed paths:
    M master/buildbot/status/web/pngstatus.py

  Log Message:
  -----------
  fix pngstatus if the build is currently in progress


  Commit: 0c4d01fe5eb2bc34060600e0e0def3dc3f702eef
      https://github.com/buildbot/buildbot/commit/0c4d01fe5eb2bc34060600e0e0def3dc3f702eef
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2014-03-01 (Sat, 01 Mar 2014)

  Changed paths:
    M master/buildbot/status/web/pngstatus.py

  Log Message:
  -----------
  Merge kviktor/buildbot:png-status-building (PR #1082)


  Commit: a6903f0178ebff7dab2616f136dcf4097a808f70
      https://github.com/buildbot/buildbot/commit/a6903f0178ebff7dab2616f136dcf4097a808f70
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2014-03-03 (Mon, 03 Mar 2014)

  Changed paths:
    M master/docs/conf.py

  Log Message:
  -----------
  Fix docs/conf.py to work with sphinx-1.2.2

Closes gh-1086.


  Commit: 3ec86ff14ad3cfab22f4d54437fb15882a48379f
      https://github.com/buildbot/buildbot/commit/3ec86ff14ad3cfab22f4d54437fb15882a48379f
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2014-03-03 (Mon, 03 Mar 2014)

  Changed paths:
    M master/docs/conf.py
    M master/docs/manual/cfg-properties.rst

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

Conflicts:
	master/buildbot/status/web/pngstatus.py


Compare: https://github.com/buildbot/buildbot/compare/549e4c16f974...3ec86ff14ad3