[Buildbot-commits] [buildbot/buildbot] 9644f3: Revert "Revert "Merge pull request #1323 from dela...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/buildbot/buildbot
  Commit: 9644f3214fb84259722c1998b2c597044c631027
      https://github.com/buildbot/buildbot/commit/9644f3214fb84259722c1998b2c597044c631027
  Author: Xavier Delannoy <xdelannoy at cloudmark.com>
  Date:   2014-11-07 (Fri, 07 Nov 2014)

  Changed paths:
    M master/buildbot/config.py
    M master/buildbot/process/builder.py
    M master/buildbot/schedulers/base.py
    M master/buildbot/schedulers/basic.py
    M master/buildbot/schedulers/timed.py
    M master/buildbot/test/fake/fakemaster.py
    M master/buildbot/test/integration/test_www.py
    M master/buildbot/test/unit/test_config.py
    M master/buildbot/test/unit/test_schedulers_base.py
    M master/buildbot/test/unit/test_schedulers_basic.py
    M master/buildbot/test/unit/test_schedulers_dependent.py
    M master/buildbot/test/unit/test_schedulers_timed_Nightly.py
    M master/buildbot/test/unit/test_schedulers_timed_NightlyTriggerable.py
    M master/buildbot/test/unit/test_schedulers_timed_Periodic.py
    M master/buildbot/test/unit/test_schedulers_trysched.py
    A master/buildbot/test/unit/test_util_codebase.py
    M master/buildbot/test/unit/test_www_service.py
    M master/buildbot/test/util/scheduler.py
    A master/buildbot/util/codebase.py
    M master/buildbot/www/service.py
    M master/contrib/Dockerfile
    M master/docs/bbdocs/ext.py
    M master/docs/developer/mq.rst
    M master/docs/manual/cfg-schedulers.rst
    M master/docs/manual/cfg-www.rst
    M master/docs/manual/cmdline.rst
    M master/docs/relnotes/index.rst
    M master/docs/tutorial/docker.rst
    M www/base/guanlecoja/config.coffee
    M www/base/src/app/layout.jade
    M www/codeparameter/guanlecoja/config.coffee
    M www/console_view/guanlecoja/config.coffee
    M www/waterfall_view/guanlecoja/config.coffee

  Log Message:
  -----------
  Revert "Revert "Merge pull request #1323 from delanne/IRCContact""

This reverts commit c203010282e3651673f98540b88c7302c7b71082.


  Commit: 92a670c3cfec53aefd552675f9f63dc74d8648d1
      https://github.com/buildbot/buildbot/commit/92a670c3cfec53aefd552675f9f63dc74d8648d1
  Author: Mikhail Sobolev <mss at mawhrin.net>
  Date:   2014-11-07 (Fri, 07 Nov 2014)

  Changed paths:
    M master/buildbot/config.py
    M master/buildbot/process/builder.py
    M master/buildbot/schedulers/base.py
    M master/buildbot/schedulers/basic.py
    M master/buildbot/schedulers/timed.py
    M master/buildbot/test/fake/fakemaster.py
    M master/buildbot/test/integration/test_www.py
    M master/buildbot/test/unit/test_config.py
    M master/buildbot/test/unit/test_schedulers_base.py
    M master/buildbot/test/unit/test_schedulers_basic.py
    M master/buildbot/test/unit/test_schedulers_dependent.py
    M master/buildbot/test/unit/test_schedulers_timed_Nightly.py
    M master/buildbot/test/unit/test_schedulers_timed_NightlyTriggerable.py
    M master/buildbot/test/unit/test_schedulers_timed_Periodic.py
    M master/buildbot/test/unit/test_schedulers_trysched.py
    A master/buildbot/test/unit/test_util_codebase.py
    M master/buildbot/test/unit/test_www_service.py
    M master/buildbot/test/util/scheduler.py
    A master/buildbot/util/codebase.py
    M master/buildbot/www/service.py
    M master/contrib/Dockerfile
    M master/docs/bbdocs/ext.py
    M master/docs/developer/mq.rst
    M master/docs/manual/cfg-schedulers.rst
    M master/docs/manual/cfg-www.rst
    M master/docs/manual/cmdline.rst
    M master/docs/relnotes/index.rst
    M master/docs/tutorial/docker.rst
    M www/base/guanlecoja/config.coffee
    M www/base/src/app/layout.jade
    M www/codeparameter/guanlecoja/config.coffee
    M www/console_view/guanlecoja/config.coffee
    M www/waterfall_view/guanlecoja/config.coffee

  Log Message:
  -----------
  Merge pull request #1333 from delanne/FixBadRevert

Revert "Revert "Merge pull request #1323 from delanne/IRCContact""


Compare: https://github.com/buildbot/buildbot/compare/a5d75dff7aa7...92a670c3cfec