[Buildbot-commits] [buildbot/buildbot] 133092: Merge with upstream.

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/buildbot/buildbot
  Commit: 133092890e3decb50bdfa7816a8ae75fcb642c6b
      https://github.com/buildbot/buildbot/commit/133092890e3decb50bdfa7816a8ae75fcb642c6b
  Author: Dave B <dave at bx.psu.edu>
  Date:   2013-12-21 (Sat, 21 Dec 2013)

  Changed paths:
    M master/buildbot/buildslave/base.py
    M master/buildbot/changes/gerritchangesource.py
    M master/buildbot/changes/gitpoller.py
    M master/buildbot/changes/hgpoller.py
    M master/buildbot/process/properties.py
    M master/buildbot/process/users/manual.py
    M master/buildbot/status/base.py
    M master/buildbot/status/master.py
    M master/buildbot/status/slave.py
    M master/buildbot/status/status_push.py
    M master/buildbot/steps/master.py
    M master/buildbot/steps/source/base.py
    M master/buildbot/steps/vstudio.py
    M master/buildbot/test/fake/fakedb.py
    M master/buildbot/test/unit/test_buildslave_base.py
    M master/buildbot/test/unit/test_changes_gerritchangesource.py
    M master/buildbot/test/unit/test_changes_gitpoller.py
    M master/buildbot/test/unit/test_changes_hgpoller.py
    M master/buildbot/test/unit/test_process_properties.py
    A master/buildbot/test/unit/test_status_slave.py
    M master/docs/manual/cfg-buildsteps.rst
    M master/docs/manual/cfg-changesources.rst
    M master/docs/manual/cfg-properties.rst
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  Merge with upstream.


  Commit: f274f7af8702240ec636e4ee78cb36522047a94b
      https://github.com/buildbot/buildbot/commit/f274f7af8702240ec636e4ee78cb36522047a94b
  Author: Dave B. <dave at bx.psu.edu>
  Date:   2014-01-14 (Tue, 14 Jan 2014)

  Changed paths:
    M master/buildbot/buildslave/ec2.py

  Log Message:
  -----------
  Fix bug in _start_instance.


  Commit: 6f0e45f10b1338d2a6dfdcafad86abbaa9c518b1
      https://github.com/buildbot/buildbot/commit/6f0e45f10b1338d2a6dfdcafad86abbaa9c518b1
  Author: Dave B <dave at bx.psu.edu>
  Date:   2014-01-14 (Tue, 14 Jan 2014)

  Changed paths:
    M common/pylintrc
    M master/buildbot/buildslave/base.py
    M master/buildbot/changes/base.py
    M master/buildbot/changes/bonsaipoller.py
    M master/buildbot/changes/gerritchangesource.py
    M master/buildbot/changes/gitpoller.py
    M master/buildbot/changes/hgpoller.py
    M master/buildbot/changes/p4poller.py
    M master/buildbot/changes/svnpoller.py
    M master/buildbot/clients/tryclient.py
    M master/buildbot/db/model.py
    M master/buildbot/process/logobserver.py
    M master/buildbot/process/properties.py
    M master/buildbot/process/slavebuilder.py
    M master/buildbot/schedulers/trysched.py
    M master/buildbot/scripts/start.py
    M master/buildbot/status/client.py
    M master/buildbot/status/mail.py
    M master/buildbot/status/slave.py
    M master/buildbot/status/web/build.py
    M master/buildbot/steps/master.py
    M master/buildbot/steps/shell.py
    M master/buildbot/steps/source/base.py
    M master/buildbot/steps/transfer.py
    M master/buildbot/test/fake/fakedb.py
    A master/buildbot/test/integration/test_try_client.py
    M master/buildbot/test/unit/test_buildslave_base.py
    M master/buildbot/test/unit/test_changes_base.py
    M master/buildbot/test/unit/test_changes_gerritchangesource.py
    M master/buildbot/test/unit/test_changes_gitpoller.py
    M master/buildbot/test/unit/test_process_properties.py
    M master/buildbot/test/unit/test_schedulers_timed_NightlyBase.py
    M master/buildbot/test/unit/test_status_mail.py
    R master/buildbot/test/unit/test_status_slave.py
    M master/buildbot/test/unit/test_steps_source_repo.py
    M master/buildbot/test/unit/test_util.py
    M master/buildbot/test/util/sourcesteps.py
    M master/buildbot/util/__init__.py
    M master/docs/developer/utils.rst
    M master/docs/manual/cfg-buildsteps.rst
    M master/docs/manual/cfg-changesources.rst
    M master/docs/manual/cfg-properties.rst
    M master/docs/manual/cfg-statustargets.rst
    M master/docs/manual/cmdline.rst
    M master/docs/manual/customization.rst
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'


  Commit: 467bb35beeb14a5b08f0543fa4ae87eee2713b18
      https://github.com/buildbot/buildbot/commit/467bb35beeb14a5b08f0543fa4ae87eee2713b18
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2014-01-14 (Tue, 14 Jan 2014)

  Changed paths:
    M master/buildbot/buildslave/ec2.py

  Log Message:
  -----------
  Merge InitHello/buildbot:master (PR #1046)


Compare: https://github.com/buildbot/buildbot/compare/4c0a13596d3f...467bb35beeb1