[Buildbot-commits] [buildbot/buildbot] db362d: Fix E228

[GitHub]

  Branch: refs/heads/nine
  Home:   https://github.com/buildbot/buildbot
  Commit: db362d7a1699f0249d423abfc87b53d70403a3b5
      https://github.com/buildbot/buildbot/commit/db362d7a1699f0249d423abfc87b53d70403a3b5
  Author: Edmund wong <ewongbb at pw-wspx.org>
  Date:   2013-10-27 (Sun, 27 Oct 2013)

  Changed paths:
    M common/pep8rc
    M master/buildbot/buildslave/ec2.py
    M master/buildbot/buildslave/openstack.py
    M master/buildbot/schedulers/forcesched.py
    M master/buildbot/status/web/authz.py
    M master/buildbot/status/web/builder.py
    M master/buildbot/steps/package/rpm/mock.py
    M master/buildbot/steps/package/rpm/rpmlint.py
    M master/buildbot/test/unit/test_process_buildrequestdistributor_BuildRequestDistributor.py
    M master/contrib/bitbucket_buildbot.py
    M master/contrib/trac/bbwatcher/api.py
    M master/contrib/trac/bbwatcher/model.py
    M master/contrib/trac/bbwatcher/web_ui.py
    M master/setup.py
    M slave/buildslave/commands/repo.py

  Log Message:
  -----------
  Fix E228


  Commit: 32d7c9680fc901a19f31fea772bfccb64cce51d0
      https://github.com/buildbot/buildbot/commit/32d7c9680fc901a19f31fea772bfccb64cce51d0
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-10-30 (Wed, 30 Oct 2013)

  Changed paths:
    M common/pep8rc
    M master/buildbot/buildslave/ec2.py
    M master/buildbot/buildslave/openstack.py
    M master/buildbot/schedulers/forcesched.py
    M master/buildbot/status/web/authz.py
    M master/buildbot/status/web/builder.py
    M master/buildbot/steps/package/rpm/mock.py
    M master/buildbot/steps/package/rpm/rpmlint.py
    M master/buildbot/test/unit/test_process_buildrequestdistributor_BuildRequestDistributor.py
    M master/contrib/bitbucket_buildbot.py
    M master/contrib/trac/bbwatcher/api.py
    M master/contrib/trac/bbwatcher/model.py
    M master/contrib/trac/bbwatcher/web_ui.py
    M master/setup.py
    M slave/buildslave/commands/repo.py

  Log Message:
  -----------
  Merge branch 'e228' of git://github.com/ewongbb/buildbot


  Commit: be4caed6372e42ee7448fecdc44abb837af1d2a3
      https://github.com/buildbot/buildbot/commit/be4caed6372e42ee7448fecdc44abb837af1d2a3
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-10-30 (Wed, 30 Oct 2013)

  Changed paths:
    M common/pep8rc
    M master/buildbot/buildslave/ec2.py
    M master/buildbot/buildslave/openstack.py
    M master/buildbot/schedulers/forcesched.py
    M master/buildbot/steps/package/rpm/mock.py
    M master/buildbot/steps/package/rpm/rpmlint.py
    M master/buildbot/test/unit/test_process_buildrequestdistributor_BuildRequestDistributor.py
    M master/buildbot/test/unit/test_www_rest.py
    M master/buildbot/test/util/txghost.py
    M master/contrib/bitbucket_buildbot.py
    M master/contrib/trac/bbwatcher/api.py
    M master/contrib/trac/bbwatcher/model.py
    M master/contrib/trac/bbwatcher/web_ui.py
    M master/setup.py
    M slave/buildslave/commands/repo.py

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

Conflicts:
	master/buildbot/status/web/authz.py
	master/buildbot/status/web/builder.py
	master/buildbot/test/unit/test_process_buildrequestdistributor_BuildRequestDistributor.py


Compare: https://github.com/buildbot/buildbot/compare/302375620d71...be4caed6372e