[Buildbot-commits] [buildbot/buildbot] aa2a0d: Ignore unavailable images for EC2 buildslaves

Sun Oct 27 21:31:50 UTC 2013

  Branch: refs/heads/nine
  Home:   https://github.com/buildbot/buildbot
  Commit: aa2a0dccae286921512aeb2254bc2cb4ad078349
      https://github.com/buildbot/buildbot/commit/aa2a0dccae286921512aeb2254bc2cb4ad078349
  Author: Patrick Lucas <plucas at yelp.com>
  Date:   2013-10-08 (Tue, 08 Oct 2013)

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

  Log Message:
  -----------
  Ignore unavailable images for EC2 buildslaves

  Commit: b40ac183aa10a47357d6b15cd4e5271daba5918c
      https://github.com/buildbot/buildbot/commit/b40ac183aa10a47357d6b15cd4e5271daba5918c
  Author: Jonas Pommerening <jonas.pommerening at aixigo.de>
  Date:   2013-10-09 (Wed, 09 Oct 2013)

  Changed paths:
    M master/buildbot/steps/source/cvs.py

  Log Message:
  -----------
  Check for sticky dates.

If a previous build did check out a specific "revision" (timestamp)
we can't update the directory with cvs update (unless we use -A).
Upload the CVS/Entries file from the slave and check for any sticky
dates.

Entries look like this:

/Filename/1.1/Fri May 17 23:20:00 2013//D2013.10.08.11.20.33
D

Just make sure the last field of each line does not start with D
(and skip the final line)

  Commit: 7a3c04043c5853f2378b3d629e670d4e8560ada6
      https://github.com/buildbot/buildbot/commit/7a3c04043c5853f2378b3d629e670d4e8560ada6
  Author: Jonas Pommerening <jonas.pommerening at aixigo.de>
  Date:   2013-10-09 (Wed, 09 Oct 2013)

  Changed paths:
    M master/buildbot/steps/source/cvs.py

  Log Message:
  -----------
  Use proper workdir and srcdir.

- Use this.srcdir for 'copy' method's source checkout.
- Keep track of the workdir, don't assume its called 'build'

  Commit: a674fbb5499510926b967967d80d2fb46500f797
      https://github.com/buildbot/buildbot/commit/a674fbb5499510926b967967d80d2fb46500f797
  Author: Jonas Pommerening <jonas.pommerening at aixigo.de>
  Date:   2013-10-09 (Wed, 09 Oct 2013)

  Changed paths:
    M master/buildbot/steps/source/cvs.py
    M master/buildbot/steps/source/git.py

  Log Message:
  -----------
  same fix for git. use "old_workdir" as in svn.py

  Commit: 3c0fcde93db82b47839992ee161ab3da74b6fcd5
      https://github.com/buildbot/buildbot/commit/3c0fcde93db82b47839992ee161ab3da74b6fcd5
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-10-17 (Thu, 17 Oct 2013)

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

  Log Message:
  -----------
  Merge branch 'only_choose_available_image' of git://github.com/patricklucas/buildbot

  Commit: 3c593164c652f0189992527051887e6b18fd439e
      https://github.com/buildbot/buildbot/commit/3c593164c652f0189992527051887e6b18fd439e
  Author: Vladimir Rutsky <altsysrq at gmail.com>
  Date:   2013-10-17 (Thu, 17 Oct 2013)

  Changed paths:
    M master/docs/Makefile

  Log Message:
  -----------
  Explicitly state that used /bin/bash shell in Makefile

Code

    $(shell if [[ `tar --version` =~ "bsdtar" ]]; ...

written using Bash double-bracket conditions syntax.  When (default on
some platforms) /bin/sh interpreter used this code outputs error (but
luckily works as required):

    /bin/sh: 1: [[: not found

  Commit: 7b1d4d833a3d425d4b8b0617d16a0f9ed8d7e8ca
      https://github.com/buildbot/buildbot/commit/7b1d4d833a3d425d4b8b0617d16a0f9ed8d7e8ca
  Author: Vladimir Rutsky <altsysrq at gmail.com>
  Date:   2013-10-17 (Thu, 17 Oct 2013)

  Changed paths:
    M master/docs/Makefile

  Log Message:
  -----------
  Use declaration-time expansion assignment for $(shell ...) variables

Not important in this case actually, but recommended for such cases in
general (so that shell expression evaluated only once).

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

  Changed paths:
    M master/buildbot/test/util/steps.py

  Log Message:
  -----------
  Check that all steps have a non-None name (fixes #2501)

  Commit: 79e137b5bf6be153ac4b6ddfdf53bfa4c2f6f6f6
      https://github.com/buildbot/buildbot/commit/79e137b5bf6be153ac4b6ddfdf53bfa4c2f6f6f6
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-10-18 (Fri, 18 Oct 2013)

  Changed paths:
    M master/buildbot/process/buildstep.py
    M master/buildbot/test/unit/test_process_buildstep.py

  Log Message:
  -----------
  render flunkOnFailure and related attributes of BuildStep; fixes #2486

  Commit: 3f13afa5b710cdd0e02df63e3fd46cec7ca5939a
      https://github.com/buildbot/buildbot/commit/3f13afa5b710cdd0e02df63e3fd46cec7ca5939a
  Author: Jonas Pommerening <jonas.pommerening at aixigo.de>
  Date:   2013-10-18 (Fri, 18 Oct 2013)

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

  Log Message:
  -----------
  Fix the tests, add a test for sticky dates.

  Commit: b7913ba34310615ad937d547d05bf383d865d562
      https://github.com/buildbot/buildbot/commit/b7913ba34310615ad937d547d05bf383d865d562
  Author: Jonas Pommerening <jonas.pommerening at aixigo.de>
  Date:   2013-10-18 (Fri, 18 Oct 2013)

  Changed paths:
    M master/buildbot/steps/source/cvs.py

  Log Message:
  -----------
  Refactored CVS step copy method.

Pulled out CVS/Entries parsing into
"_cvsEntriesContainStickyDates(entries)". Tests should still pass.

  Commit: ac5b189aa7ee684f2c40d2a12e5e3873b733fa1a
      https://github.com/buildbot/buildbot/commit/ac5b189aa7ee684f2c40d2a12e5e3873b733fa1a
  Author: Vladimir Rutsky <altsysrq at gmail.com>
  Date:   2013-10-18 (Fri, 18 Oct 2013)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  On Python 2.5 and 2.7 install txrequests

Required for several tests:

buildbot.test.unit.test_steps_http.TestHTTPStep.test_404
buildbot.test.unit.test_steps_http.TestHTTPStep.test_POST
buildbot.test.unit.test_steps_http.TestHTTPStep.test_basic
buildbot.test.unit.test_steps_http.TestHTTPStep.test_header

  Commit: 960835edd77cbe46aded2e03a87c81364c6edbb1
      https://github.com/buildbot/buildbot/commit/960835edd77cbe46aded2e03a87c81364c6edbb1
  Author: Vladimir Rutsky <altsysrq at gmail.com>
  Date:   2013-10-18 (Fri, 18 Oct 2013)

  Changed paths:
    M Makefile
    A common/pep8rc

  Log Message:
  -----------
  Add Makefile target for running pep8 and pep8 configuration

Currently pep8 configured to ignore ALL errors that occures in Buildbot
code.

  Commit: d0043f3171c2b33115fcc8e6ddc95d469b760f88
      https://github.com/buildbot/buildbot/commit/d0043f3171c2b33115fcc8e6ddc95d469b760f88
  Author: Vladimir Rutsky <altsysrq at gmail.com>
  Date:   2013-10-18 (Fri, 18 Oct 2013)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Run pep8 on Travis

  Commit: ba14162482d03758c198b3da02d63fad5f100a7a
      https://github.com/buildbot/buildbot/commit/ba14162482d03758c198b3da02d63fad5f100a7a
  Author: Vladimir Rutsky <altsysrq at gmail.com>
  Date:   2013-10-18 (Fri, 18 Oct 2013)

  Changed paths:
    M common/pep8rc
    M master/buildbot/status/web/base.py
    M master/buildbot/test/unit/test_changes_p4poller.py
    M master/buildbot/test/unit/test_steps_package_rpm_rpmbuild.py

  Log Message:
  -----------
  Fix pep8 issue E101: indentation contains mixed spaces and tabs

  Commit: 848bec3b85fdf7a4e2fa099d61ff06f2b5c01310
      https://github.com/buildbot/buildbot/commit/848bec3b85fdf7a4e2fa099d61ff06f2b5c01310
  Author: Vladimir Rutsky <altsysrq at gmail.com>
  Date:   2013-10-18 (Fri, 18 Oct 2013)

  Changed paths:
    M Makefile

  Log Message:
  -----------
  Check only master and slave subdirectories with pep8

www/ subdirectory contains third party Python scripts which coding style
is not interesting to us.

  Commit: 85800580d478b73da2b24d7f6a6d512e245a0f57
      https://github.com/buildbot/buildbot/commit/85800580d478b73da2b24d7f6a6d512e245a0f57
  Author: Vladimir Rutsky <altsysrq at gmail.com>
  Date:   2013-10-18 (Fri, 18 Oct 2013)

  Changed paths:
    M common/pep8rc
    M master/buildbot/changes/changes.py
    M master/buildbot/changes/gerritchangesource.py
    M master/buildbot/changes/mail.py
    M master/buildbot/db/buildrequests.py
    M master/buildbot/db/buildsets.py
    M master/buildbot/process/properties.py
    M master/buildbot/schedulers/forcesched.py
    M master/buildbot/scripts/stop.py
    M master/buildbot/sourcestamp.py
    M master/buildbot/status/web/builder.py
    M master/buildbot/test/fake/web.py
    M master/buildbot/test/unit/test_db_buildrequests.py
    M master/buildbot/test/unit/test_db_buildsets.py
    M master/buildbot/test/unit/test_sourcestamp.py
    M master/buildbot/test/unit/test_status_mail.py
    M master/contrib/SimpleConfig.py
    M master/contrib/buildbot_cvs_mail.py
    M slave/buildslave/commands/repo.py
    M slave/contrib/windows/buildbot_service.py

  Log Message:
  -----------
  Fix pep8 error E111: indentation is not a multiple of four

File master/contrib/buildbot_json.py was completely excluded from pep8
analysis because it uses two spaces for indentation.

  Commit: 2442b41aa5ff07c76113046045dde611b571732e
      https://github.com/buildbot/buildbot/commit/2442b41aa5ff07c76113046045dde611b571732e
  Author: Jonas Pommerening <jonas.pommerening at aixigo.de>
  Date:   2013-10-19 (Sat, 19 Oct 2013)

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

  Log Message:
  -----------
  Fixed tests broken by b40ac18

  Commit: d158a5ae1eb6722949c5dd8d4b581349141304ba
      https://github.com/buildbot/buildbot/commit/d158a5ae1eb6722949c5dd8d4b581349141304ba
  Author: Jonas Pommerening <jonas.pommerening at aixigo.de>
  Date:   2013-10-19 (Sat, 19 Oct 2013)

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

  Log Message:
  -----------
  Added test for _cvsEntriesContainStickyDates

  Commit: ecd34310aeaf822e70315823599bc18071ee579a
      https://github.com/buildbot/buildbot/commit/ecd34310aeaf822e70315823599bc18071ee579a
  Author: Jonas Pommerening <jonas.pommerening at aixigo.de>
  Date:   2013-10-19 (Sat, 19 Oct 2013)

  Changed paths:
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  Release notes

  Commit: b5d941f7df3b61d0c613dc1a6d69c24d0b79b503
      https://github.com/buildbot/buildbot/commit/b5d941f7df3b61d0c613dc1a6d69c24d0b79b503
  Author: Jonas Pommerening <jonas.pommerening at aixigo.de>
  Date:   2013-10-19 (Sat, 19 Oct 2013)

  Changed paths:
    M master/buildbot/test/unit/test_steps_source_cvs.py
    M master/buildbot/test/unit/test_steps_source_git.py

  Log Message:
  -----------
  Fixed CVS, Git source step "copy" method tests.

  Commit: fdeaae1f3220e5fc09c53602e411cc878c1c86b5
      https://github.com/buildbot/buildbot/commit/fdeaae1f3220e5fc09c53602e411cc878c1c86b5
  Author: Jonas Pommerening <jonas.pommerening at aixigo.de>
  Date:   2013-10-19 (Sat, 19 Oct 2013)

  Changed paths:
    M master/buildbot/steps/source/git.py

  Log Message:
  -----------
  Use --init when updating submodules of a repo.

  Commit: 2319a1534560ea1f6d0e690f6be048a15a8d92b8
      https://github.com/buildbot/buildbot/commit/2319a1534560ea1f6d0e690f6be048a15a8d92b8
  Author: Jonas Pommerening <jonas.pommerening at aixigo.de>
  Date:   2013-10-19 (Sat, 19 Oct 2013)

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

  Log Message:
  -----------
  Test that submodule update --init is used.

  Commit: 73d62ec63421f420908dd7acef82ae6d0fbc1bf5
      https://github.com/buildbot/buildbot/commit/73d62ec63421f420908dd7acef82ae6d0fbc1bf5
  Author: Jonas Pommerening <jonas.pommerening at aixigo.de>
  Date:   2013-10-19 (Sat, 19 Oct 2013)

  Changed paths:
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  Release notes for git submodule update --init.

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

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Merge branch 'travis_install_txrequests' of git://github.com/vrutsky/buildbot

  Commit: 209e30bf0992f0296efe7df6f5a5c439ae585257
      https://github.com/buildbot/buildbot/commit/209e30bf0992f0296efe7df6f5a5c439ae585257
  Author: Jonas <jonas.pommerening at gmail.com>
  Date:   2013-10-19 (Sat, 19 Oct 2013)

  Changed paths:
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  Release notes: Git and CVS silently changed workdir

  Commit: 8efbee5b886ae31799fc9434bcac8a7211790696
      https://github.com/buildbot/buildbot/commit/8efbee5b886ae31799fc9434bcac8a7211790696
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-10-19 (Sat, 19 Oct 2013)

  Changed paths:
    M master/buildbot/steps/source/cvs.py
    M master/buildbot/test/unit/test_steps_source_cvs.py
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  Merge branch 'cvs-check-sticky-dates' of git://github.com/jpommerening/buildbot

  Commit: c868f8f924a3306d5a316785d5a15c7988820cdd
      https://github.com/buildbot/buildbot/commit/c868f8f924a3306d5a316785d5a15c7988820cdd
  Author: Vladimir Rutsky <altsysrq at gmail.com>
  Date:   2013-10-19 (Sat, 19 Oct 2013)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Use bash commands grouping with parentheses instead pushd/popd

  Commit: 5118be2ae9b54f2095a4c719a7e2da3fe28eaba6
      https://github.com/buildbot/buildbot/commit/5118be2ae9b54f2095a4c719a7e2da3fe28eaba6
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-10-19 (Sat, 19 Oct 2013)

  Changed paths:
    M .travis.yml
    M Makefile
    A common/pep8rc
    M master/buildbot/changes/changes.py
    M master/buildbot/changes/gerritchangesource.py
    M master/buildbot/changes/mail.py
    M master/buildbot/db/buildrequests.py
    M master/buildbot/db/buildsets.py
    M master/buildbot/process/properties.py
    M master/buildbot/schedulers/forcesched.py
    M master/buildbot/scripts/stop.py
    M master/buildbot/sourcestamp.py
    M master/buildbot/status/web/base.py
    M master/buildbot/status/web/builder.py
    M master/buildbot/test/fake/web.py
    M master/buildbot/test/unit/test_changes_p4poller.py
    M master/buildbot/test/unit/test_db_buildrequests.py
    M master/buildbot/test/unit/test_db_buildsets.py
    M master/buildbot/test/unit/test_sourcestamp.py
    M master/buildbot/test/unit/test_status_mail.py
    M master/buildbot/test/unit/test_steps_package_rpm_rpmbuild.py
    M master/contrib/SimpleConfig.py
    M master/contrib/buildbot_cvs_mail.py
    M slave/buildslave/commands/repo.py
    M slave/contrib/windows/buildbot_service.py

  Log Message:
  -----------
  Merge branch 'use_pep8' of git://github.com/vrutsky/buildbot

  Commit: 9dbcb9f43b6470e78b90e596747a3cb4da603d6d
      https://github.com/buildbot/buildbot/commit/9dbcb9f43b6470e78b90e596747a3cb4da603d6d
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-10-19 (Sat, 19 Oct 2013)

  Changed paths:
    M common/validate.sh

  Log Message:
  -----------
  add pep8 to validate

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

  Changed paths:
    M master/buildbot/steps/source/cvs.py
    M master/buildbot/steps/source/git.py
    M master/buildbot/test/unit/test_steps_source_cvs.py
    M master/buildbot/test/unit/test_steps_source_git.py
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  Merge branch 'source-method-copy-srcdir' of git://github.com/jpommerening/buildbot

  Commit: 2700f4eff11d9e505e39a2e92fed896b7b7cfb55
      https://github.com/buildbot/buildbot/commit/2700f4eff11d9e505e39a2e92fed896b7b7cfb55
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-10-19 (Sat, 19 Oct 2013)

  Changed paths:
    M common/validate.sh

  Log Message:
  -----------
  update validate.sh to only warn about long lines, relnotes

  Commit: 63f1260183e8cf813aa3acde31ffd127076b0c2d
      https://github.com/buildbot/buildbot/commit/63f1260183e8cf813aa3acde31ffd127076b0c2d
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-10-19 (Sat, 19 Oct 2013)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Merge branch 'travis_group_instead_popd' of git://github.com/vrutsky/buildbot

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

  Changed paths:
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  fix typo

  Commit: a3ce064a77edb4eab82b2346475e68d1cd78dcd9
      https://github.com/buildbot/buildbot/commit/a3ce064a77edb4eab82b2346475e68d1cd78dcd9
  Author: Amber Yust <amber.yust at gmail.com>
  Date:   2013-10-19 (Sat, 19 Oct 2013)

  Changed paths:
    M master/buildbot/steps/source/git.py
    M master/buildbot/test/unit/test_steps_source_git.py
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  Merge pull request #925 from jpommerening/git-submodule-update-init

Use `--init` when updating Git submodules

  Commit: 69da807b830424c1cb957931b72e3ad99eb34dee
      https://github.com/buildbot/buildbot/commit/69da807b830424c1cb957931b72e3ad99eb34dee
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-10-20 (Sun, 20 Oct 2013)

  Changed paths:
    M master/buildbot/test/util/steps.py

  Log Message:
  -----------
  Merge branch 'check-step-names' of git://github.com/djmitche/buildbot

  Commit: 8d6d3a2e20e0ea21ec022106532cacfaf3744963
      https://github.com/buildbot/buildbot/commit/8d6d3a2e20e0ea21ec022106532cacfaf3744963
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-10-20 (Sun, 20 Oct 2013)

  Changed paths:
    M master/buildbot/process/buildstep.py
    M master/buildbot/test/unit/test_process_buildstep.py

  Log Message:
  -----------
  Merge branch 'render-onFailures' of git://github.com/djmitche/buildbot

  Commit: c377e20eb2585702d9d25d16fd2a2e1cf0e329a2
      https://github.com/buildbot/buildbot/commit/c377e20eb2585702d9d25d16fd2a2e1cf0e329a2
  Author: Vladimir Rutsky <altsysrq at gmail.com>
  Date:   2013-10-22 (Tue, 22 Oct 2013)

  Changed paths:
    M master/docs/Makefile

  Log Message:
  -----------
  Use make conditions instead bash conditions

Suggested by @jpommerening.

  Commit: 281faae2acb4a79baa056ccf7dbd62253fe3156c
      https://github.com/buildbot/buildbot/commit/281faae2acb4a79baa056ccf7dbd62253fe3156c
  Author: Vladimir Rutsky <altsysrq at gmail.com>
  Date:   2013-10-22 (Tue, 22 Oct 2013)

  Changed paths:
    M master/docs/Makefile

  Log Message:
  -----------
  Add missed spaces around ':='

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

  Changed paths:
    M master/docs/Makefile

  Log Message:
  -----------
  Merge branch 'fix_docs_makefile' of git://github.com/vrutsky/buildbot

  Commit: cd51ac6c3e4273e1493902c5bc3c5b51fa233f2e
      https://github.com/buildbot/buildbot/commit/cd51ac6c3e4273e1493902c5bc3c5b51fa233f2e
  Author: Ben Hearsum <bhearsum at mozilla.com>
  Date:   2013-10-23 (Wed, 23 Oct 2013)

  Changed paths:
    M master/buildbot/process/buildstep.py

  Log Message:
  -----------
  Don't overwrite RETRY status when handling interrupts.

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

  Changed paths:
    M master/buildbot/process/buildstep.py

  Log Message:
  -----------
  Merge branch 'dont-override-retry' of git://github.com/bhearsum/buildbot

  Commit: e210fec02c13025bd593cb0568e1cf48d5a7f8d5
      https://github.com/buildbot/buildbot/commit/e210fec02c13025bd593cb0568e1cf48d5a7f8d5
  Author: Elmir Jagudin <elmir at axis.com>
  Date:   2013-10-23 (Wed, 23 Oct 2013)

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

  Log Message:
  -----------
  ignore http proxy env variables during http step tests

When running unit tests of buildbot.steps.http, ignore http
proxy environment variables. Otherwise tests will try to make
http requests via proxy if for example 'http_proxy' variable
is set.

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

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

  Log Message:
  -----------
  Merge branch 'http-step-proxy' of git://github.com/elmirjagudin/buildbot

  Commit: 267c7f0c9e6e349745533839f4206e6964940a46
      https://github.com/buildbot/buildbot/commit/267c7f0c9e6e349745533839f4206e6964940a46
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-10-27 (Sun, 27 Oct 2013)

  Changed paths:
    M .travis.yml
    M common/validate.sh
    M master/buildbot/buildslave/ec2.py
    M master/buildbot/process/buildstep.py
    M master/buildbot/steps/source/cvs.py
    M master/buildbot/steps/source/git.py
    M master/buildbot/test/unit/test_process_buildstep.py
    M master/buildbot/test/unit/test_steps_http.py
    M master/buildbot/test/unit/test_steps_source_cvs.py
    M master/buildbot/test/unit/test_steps_source_git.py
    M master/buildbot/test/util/steps.py
    M master/docs/Makefile
    M master/docs/relnotes/index.rst

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

Conflicts:
	.travis.yml
	Makefile
	common/validate.sh
	master/buildbot/db/buildrequests.py
	master/buildbot/process/buildstep.py
	master/buildbot/sourcestamp.py
	master/buildbot/status/web/base.py
	master/buildbot/status/web/builder.py
	master/buildbot/steps/source/cvs.py
	master/buildbot/steps/source/git.py
	master/buildbot/test/unit/test_changes_p4poller.py
	master/buildbot/test/unit/test_db_buildsets.py
	master/buildbot/test/unit/test_process_buildstep.py
	master/buildbot/test/unit/test_sourcestamp.py
	master/buildbot/test/unit/test_status_mail.py

Compare: https://github.com/buildbot/buildbot/compare/b1c9e0064c67...267c7f0c9e6e