[Buildbot-commits] [buildbot/buildbot] 12e8bb: gitpoller test strings should be unicode

[GitHub]

  Branch: refs/heads/nine
  Home:   https://github.com/buildbot/buildbot
  Commit: 12e8bbbcff0c354d921e4266b266fef69461928c
      https://github.com/buildbot/buildbot/commit/12e8bbbcff0c354d921e4266b266fef69461928c
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-11-26 (Tue, 26 Nov 2013)

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

  Log Message:
  -----------
  gitpoller test strings should be unicode


  Commit: af34e40592d7a999b794eef6d695f8f9c99bd82a
      https://github.com/buildbot/buildbot/commit/af34e40592d7a999b794eef6d695f8f9c99bd82a
  Author: Andriy Senkovych <jolly_roger at itblog.org.ua>
  Date:   2013-11-26 (Tue, 26 Nov 2013)

  Changed paths:
    M master/buildbot/status/web/grid.py
    M master/buildbot/status/web/templates/grid_macros.html

  Log Message:
  -----------
  Do not merge branches with different codebase/project


  Commit: 561e14310351d9a3adb764b065c6326fda8df794
      https://github.com/buildbot/buildbot/commit/561e14310351d9a3adb764b065c6326fda8df794
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-11-26 (Tue, 26 Nov 2013)

  Changed paths:
    M master/buildbot/status/web/grid.py
    M master/buildbot/status/web/templates/grid_macros.html

  Log Message:
  -----------
  Merge branch 'multiple-projects' of https://github.com/jollyroger/buildbot

+autopep8


  Commit: a82c1adc0811930240679ca981686e7bdb1fe932
      https://github.com/buildbot/buildbot/commit/a82c1adc0811930240679ca981686e7bdb1fe932
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-11-26 (Tue, 26 Nov 2013)

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

  Log Message:
  -----------
  don't override `time` Jinja2 parameter


  Commit: 50c900d2b03efcf7e5f195c4649b74a941f4210d
      https://github.com/buildbot/buildbot/commit/50c900d2b03efcf7e5f195c4649b74a941f4210d
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-11-28 (Thu, 28 Nov 2013)

  Changed paths:
    M master/buildbot/status/web/templates/feed_description.html

  Log Message:
  -----------
  escape author names in feeds

Fixes #2596


  Commit: 8f1e7184b316c8e74f411e539bd7fe48b52a9b77
      https://github.com/buildbot/buildbot/commit/8f1e7184b316c8e74f411e539bd7fe48b52a9b77
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-11-28 (Thu, 28 Nov 2013)

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

  Log Message:
  -----------
  Merge branch 'waterfall-pagebuilt' of git://github.com/djmitche/buildbot


  Commit: a2ca4c1d596ce31302d06c129c51cbc0be053abf
      https://github.com/buildbot/buildbot/commit/a2ca4c1d596ce31302d06c129c51cbc0be053abf
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-11-28 (Thu, 28 Nov 2013)

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

Conflicts:
	master/buildbot/status/web/grid.py
	master/buildbot/status/web/templates/feed_description.html
	master/buildbot/status/web/templates/grid_macros.html
	master/buildbot/status/web/waterfall.py


Compare: https://github.com/buildbot/buildbot/compare/655835086568...a2ca4c1d596c