[Buildbot-commits] [buildbot/buildbot] 03bb8b: Use a variable rather than constructor argument fo...

Mon Jun 24 03:37:54 UTC 2013

  Branch: refs/heads/nine
  Home:   https://github.com/buildbot/buildbot
  Commit: 03bb8bfe7051d4068e687b1d94482f9e202a9f38
      https://github.com/buildbot/buildbot/commit/03bb8bfe7051d4068e687b1d94482f9e202a9f38
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2013-04-13 (Sat, 13 Apr 2013)

  Changed paths:
    M slave/buildslave/scripts/runner.py

  Log Message:
  -----------
  Use a variable rather than constructor argument for allow_shutdown.

This is consistent with the other options, and makes it easy to see all
the settings.

  Commit: 1a70a0f05ffa01e3022d1171c32ec4c2d5e4fac0
      https://github.com/buildbot/buildbot/commit/1a70a0f05ffa01e3022d1171c32ec4c2d5e4fac0
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2013-04-13 (Sat, 13 Apr 2013)

  Changed paths:
    M master/buildbot/status/words.py
    M master/buildbot/test/unit/test_status_words.py

  Log Message:
  -----------
  Report config errors, rather than assertions in IRCClient.

  Commit: b050647b470e36b000e63a87b68c5ef6c7effdb8
      https://github.com/buildbot/buildbot/commit/b050647b470e36b000e63a87b68c5ef6c7effdb8
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2013-04-13 (Sat, 13 Apr 2013)

  Changed paths:
    M common/generate_buildbot_api_documentation.sh
    M master/buildbot/buildslave/__init__.py
    M master/buildbot/db/schedulers.py
    M master/buildbot/master.py
    M master/buildbot/process/botmaster.py
    M master/buildbot/process/build.py
    M master/buildbot/process/builder.py
    M master/buildbot/process/buildrequestdistributor.py
    M master/buildbot/process/buildstep.py
    M master/buildbot/schedulers/forcesched.py
    M master/buildbot/status/web/builder.py
    M master/buildbot/status/web/grid.py
    M master/buildbot/steps/python_twisted.py
    M master/buildbot/steps/slave.py
    M master/buildbot/steps/source/git.py
    M master/buildbot/test/fake/fakedb.py
    M master/buildbot/test/unit/test_process_build.py
    M master/buildbot/test/unit/test_process_builder.py
    M master/buildbot/test/unit/test_process_buildrequestdistributor_BuildRequestDistributor.py
    M master/buildbot/test/unit/test_scripts_restart.py
    M master/buildbot/test/unit/test_steps_master.py
    M master/buildbot/test/unit/test_steps_slave.py
    M master/buildbot/test/unit/test_steps_source_svn.py
    M master/buildbot/test/unit/test_util_maildir.py
    M master/buildbot/util/maildir.py
    M master/docs/manual/cfg-builders.rst
    M master/docs/manual/cfg-buildsteps.rst
    M master/docs/manual/cfg-schedulers.rst
    M master/docs/manual/installation.rst
    M master/docs/relnotes/0.8.7.rst
    M master/docs/tutorial/fiveminutes.rst
    M master/docs/tutorial/further.rst

  Log Message:
  -----------
  Fix whitespace.

  Commit: a9e33983ac24692a528147ae30789cf4aa03d37d
      https://github.com/buildbot/buildbot/commit/a9e33983ac24692a528147ae30789cf4aa03d37d
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2013-04-13 (Sat, 13 Apr 2013)

  Changed paths:
    M master/buildbot/steps/source/oldsource.py
    M master/buildbot/steps/source/repo.py

  Log Message:
  -----------
  Remove no-op addFactoryArguments calls.

addFactoryArguments is deprecated now.

  Commit: 39620ef33360524016974d0c8aef7352aa968267
      https://github.com/buildbot/buildbot/commit/39620ef33360524016974d0c8aef7352aa968267
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2013-04-13 (Sat, 13 Apr 2013)

  Changed paths:
    M master/buildbot/scripts/runner.py
    M master/buildbot/test/unit/test_scripts_runner.py

  Log Message:
  -----------
  s/validate_master_option/validateMasterOption/

  Commit: d4d7e95c4ea116b31b593801d6916529d2e37fd5
      https://github.com/buildbot/buildbot/commit/d4d7e95c4ea116b31b593801d6916529d2e37fd5
  Author: Olof Johansson <olofjn at axis.com>
  Date:   2013-04-27 (Sat, 27 Apr 2013)

  Changed paths:
    M master/docs/manual/cfg-statustargets.rst

  Log Message:
  -----------
  Update docs referring to the old getProjectName()

The buildbot.status.master.getProjectName() has been renamed to
getTitle().

  Commit: 18f62a59d611b727641c9dd22c1bc5950ef9e5f6
      https://github.com/buildbot/buildbot/commit/18f62a59d611b727641c9dd22c1bc5950ef9e5f6
  Author: Elmir Jagudin <elmir at axis.com>
  Date:   2013-06-02 (Sun, 02 Jun 2013)

  Changed paths:
    M master/buildbot/scripts/base.py
    M master/buildbot/scripts/runner.py
    M slave/buildslave/scripts/runner.py

  Log Message:
  -----------
  fixed PEP8 violations

  Commit: 49d68cc5d9c28b11ef26d8dea3a3f1b6965d6797
      https://github.com/buildbot/buildbot/commit/49d68cc5d9c28b11ef26d8dea3a3f1b6965d6797
  Author: Elmir Jagudin <elmir at axis.com>
  Date:   2013-06-02 (Sun, 02 Jun 2013)

  Changed paths:
    M master/buildbot/scripts/base.py
    M master/buildbot/scripts/runner.py
    M slave/buildslave/scripts/runner.py

  Log Message:
  -----------
  added shell completion hints

For 'buildbot' and 'buildslave' subcommands that take
base directory as first argument, suggest directories.

For 'buildbot checkconfig' suggest files as first
argument.

  Commit: c9cbd58f783224a2356ac6ec0997fa3de2fa091b
      https://github.com/buildbot/buildbot/commit/c9cbd58f783224a2356ac6ec0997fa3de2fa091b
  Author: Elmir Jagudin <elmir at axis.com>
  Date:   2013-06-02 (Sun, 02 Jun 2013)

  Changed paths:
    M master/contrib/README.txt
    A master/contrib/zsh/_buildbot
    A slave/contrib/README.txt
    A slave/contrib/zsh/_buildslave

  Log Message:
  -----------
  added zsh completions files

Added files that can be used to enable tab-completion in zsh
for 'buildbot' and 'buildslave' commands.

  Commit: 9f0b93c3ca0ce0c3c69c010cd863b5f9299e0f50
      https://github.com/buildbot/buildbot/commit/9f0b93c3ca0ce0c3c69c010cd863b5f9299e0f50
  Author: Elmir Jagudin <elmir at axis.com>
  Date:   2013-06-02 (Sun, 02 Jun 2013)

  Changed paths:
    M master/contrib/README.txt
    A master/contrib/bash/buildbot
    M slave/contrib/README.txt
    A slave/contrib/bash/buildslave

  Log Message:
  -----------
  added bash completions files

Added files that can be used to enable tab-completion in bash
for 'buildbot' and 'buildslave' commands.

  Commit: 82ee171b8db983bb4c4c3d2158492cd7496526ae
      https://github.com/buildbot/buildbot/commit/82ee171b8db983bb4c4c3d2158492cd7496526ae
  Author: Dylan Rajaratnam <thedylman at gmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M master/buildbot/schedulers/base.py
    M master/buildbot/schedulers/basic.py
    M master/buildbot/test/unit/test_schedulers_basic.py

  Log Message:
  -----------
  SingleBranchScheduler: add createAbsoluteSourceStamps config option

This option affects multi-codebase setups. When this option is enabled,
it uses the last revision seen for each codebase without a change instead
of using the latest revision.

  Commit: e5140ce5f6c42e271adae1a26365a4eaabfba1bd
      https://github.com/buildbot/buildbot/commit/e5140ce5f6c42e271adae1a26365a4eaabfba1bd
  Author: Elmir Jagudin <elmir at axis.com>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M master/buildbot/monkeypatches/__init__.py
    A master/buildbot/monkeypatches/twisted_completions.py
    M master/buildbot/scripts/runner.py
    M slave/buildslave/monkeypatches/__init__.py
    A slave/buildslave/monkeypatches/twisted_completions.py
    M slave/buildslave/scripts/runner.py

  Log Message:
  -----------
  monkeypatch shell completions defintions for older twisted

The shell completions support was added in twisted 11.1.0. When
running with older twisted, add completions definitions we are using
to twisted.python.usage module.

  Commit: 90b0883b73da82749f066c2ea1a4438b3e303d97
      https://github.com/buildbot/buildbot/commit/90b0883b73da82749f066c2ea1a4438b3e303d97
  Author: Elmir Jagudin <elmir at axis.com>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

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

  Log Message:
  -----------
  Mention tab-completions in the release notes.

  Commit: a9219ab771680285226dd2d78e7ffac3d27c17d6
      https://github.com/buildbot/buildbot/commit/a9219ab771680285226dd2d78e7ffac3d27c17d6
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

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

  Log Message:
  -----------
  convert calls to addStep in factory.py to use instances

  Commit: 2a4b8386e086a5c88f05e7c0342cce6f9b0fd041
      https://github.com/buildbot/buildbot/commit/2a4b8386e086a5c88f05e7c0342cce6f9b0fd041
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    M master/buildbot/process/factory.py
    M master/docs/developer/cls-forcesched.rst
    M master/docs/manual/cfg-statustargets.rst
    M master/docs/relnotes/index.rst
    M master/setup.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/buildbot-0.8.8' into buildbot-0.8.8

  Commit: fd2a09cfa11d30c555a8f059fa997396b654120b
      https://github.com/buildbot/buildbot/commit/fd2a09cfa11d30c555a8f059fa997396b654120b
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

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

  Log Message:
  -----------
  relnotes for bug 2502

  Commit: 6a49388f2daeb12a93b7dbdec72b844fb663fd55
      https://github.com/buildbot/buildbot/commit/6a49388f2daeb12a93b7dbdec72b844fb663fd55
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    M master/buildbot/process/factory.py
    M master/docs/relnotes/0.8.8.rst

  Log Message:
  -----------
  Merge branch 'buildbot-0.8.8'

  Commit: 05b7e733ce40a6d21568c8115f6e34ec03cc3e2f
      https://github.com/buildbot/buildbot/commit/05b7e733ce40a6d21568c8115f6e34ec03cc3e2f
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    M common/generate_buildbot_api_documentation.sh
    M master/buildbot/buildslave/__init__.py
    M master/buildbot/db/schedulers.py
    M master/buildbot/master.py
    M master/buildbot/process/botmaster.py
    M master/buildbot/process/build.py
    M master/buildbot/process/builder.py
    M master/buildbot/process/buildrequestdistributor.py
    M master/buildbot/process/buildstep.py
    M master/buildbot/schedulers/forcesched.py
    M master/buildbot/scripts/runner.py
    M master/buildbot/status/web/builder.py
    M master/buildbot/status/web/grid.py
    M master/buildbot/status/words.py
    M master/buildbot/steps/python_twisted.py
    M master/buildbot/steps/slave.py
    M master/buildbot/steps/source/git.py
    M master/buildbot/steps/source/oldsource.py
    M master/buildbot/steps/source/repo.py
    M master/buildbot/test/fake/fakedb.py
    M master/buildbot/test/unit/test_process_build.py
    M master/buildbot/test/unit/test_process_builder.py
    M master/buildbot/test/unit/test_process_buildrequestdistributor_BuildRequestDistributor.py
    M master/buildbot/test/unit/test_scripts_restart.py
    M master/buildbot/test/unit/test_scripts_runner.py
    M master/buildbot/test/unit/test_status_words.py
    M master/buildbot/test/unit/test_steps_master.py
    M master/buildbot/test/unit/test_steps_slave.py
    M master/buildbot/test/unit/test_steps_source_svn.py
    M master/buildbot/test/unit/test_util_maildir.py
    M master/buildbot/util/maildir.py
    M master/docs/manual/cfg-builders.rst
    M master/docs/manual/cfg-buildsteps.rst
    M master/docs/manual/cfg-schedulers.rst
    M master/docs/manual/installation.rst
    M master/docs/relnotes/0.8.7.rst
    M master/docs/tutorial/fiveminutes.rst
    M master/docs/tutorial/further.rst
    M slave/buildslave/scripts/create_slave.py

  Log Message:
  -----------
  Merge branch 'buildbot-0.8.8'

  Commit: c2006cf91077df05058a40565485a79172e71edb
      https://github.com/buildbot/buildbot/commit/c2006cf91077df05058a40565485a79172e71edb
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-06-08 (Sat, 08 Jun 2013)

  Changed paths:
    M master/buildbot/util/state.py

  Log Message:
  -----------
  add missing copyright header

  Commit: 949a42c67f4251e6dfba4a399bab62e8c2ab0c8f
      https://github.com/buildbot/buildbot/commit/949a42c67f4251e6dfba4a399bab62e8c2ab0c8f
  Author: Dylan Rajaratnam <thedylman at gmail.com>
  Date:   2013-06-08 (Sat, 08 Jun 2013)

  Changed paths:
    M master/docs/manual/cfg-schedulers.rst
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  SingleBranchScheduler: add description and note for createAbsoluteSourceStamps argument.

  Commit: 91316a287990a4fd7e5010961c02bfc3d9ff8618
      https://github.com/buildbot/buildbot/commit/91316a287990a4fd7e5010961c02bfc3d9ff8618
  Author: Dylan Rajaratnam <thedylman at gmail.com>
  Date:   2013-06-10 (Mon, 10 Jun 2013)

  Changed paths:
    M master/buildbot/schedulers/basic.py

  Log Message:
  -----------
  SingleBranchScheduler: only access database if createAbsoluteSourceStamps enabled

  Commit: e082a5a580b80c6fc065520656fd959f5dd5e878
      https://github.com/buildbot/buildbot/commit/e082a5a580b80c6fc065520656fd959f5dd5e878
  Author: Dylan Rajaratnam <thedylman at gmail.com>
  Date:   2013-06-10 (Mon, 10 Jun 2013)

  Changed paths:
    M master/buildbot/schedulers/basic.py

  Log Message:
  -----------
  SingleBranchScheduler: remove shouldntBeSet argument and return None in defer

  Commit: 4c527415b40c85e91b6fa15480c895e3c504c69a
      https://github.com/buildbot/buildbot/commit/4c527415b40c85e91b6fa15480c895e3c504c69a
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-06-13 (Thu, 13 Jun 2013)

  Changed paths:
    M master/buildbot/monkeypatches/__init__.py
    A master/buildbot/monkeypatches/twisted_completions.py
    M master/buildbot/scripts/base.py
    M master/buildbot/scripts/runner.py
    M master/contrib/README.txt
    A master/contrib/bash/buildbot
    A master/contrib/zsh/_buildbot
    M master/docs/relnotes/index.rst
    M slave/buildslave/monkeypatches/__init__.py
    A slave/buildslave/monkeypatches/twisted_completions.py
    M slave/buildslave/scripts/runner.py
    A slave/contrib/README.txt
    A slave/contrib/bash/buildslave
    A slave/contrib/zsh/_buildslave

  Log Message:
  -----------
  Merge branch 'shell-completions' of git://github.com/elmirjagudin/buildbot

  Commit: 945182d74c18b8beeac2685ffdba69d2f4b5d172
      https://github.com/buildbot/buildbot/commit/945182d74c18b8beeac2685ffdba69d2f4b5d172
  Author: Dan Kegel <dank at kegel.com>
  Date:   2013-06-13 (Thu, 13 Jun 2013)

  Changed paths:
    M master/contrib/README.txt
    A master/contrib/SimpleConfig.py
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  Add delarative configuration example in master/contrib/SimpleConfig.py

  Commit: 95f4392f172c81f0f054b056df86cd9ef8027489
      https://github.com/buildbot/buildbot/commit/95f4392f172c81f0f054b056df86cd9ef8027489
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-06-13 (Thu, 13 Jun 2013)

  Changed paths:
    M master/buildbot/monkeypatches/__init__.py
    R master/buildbot/monkeypatches/twisted_completions.py
    M master/buildbot/scripts/base.py
    M master/buildbot/scripts/runner.py
    M slave/buildslave/monkeypatches/__init__.py
    R slave/buildslave/monkeypatches/twisted_completions.py
    M slave/buildslave/scripts/runner.py

  Log Message:
  -----------
  Replace monkey-patching for Twisteds without completion

This just only attempts to use usage.Completion when that attribute
exists.

  Commit: 6fa284f782b518836069a2e00005ce3853238aac
      https://github.com/buildbot/buildbot/commit/6fa284f782b518836069a2e00005ce3853238aac
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-06-13 (Thu, 13 Jun 2013)

  Changed paths:
    M master/buildbot/schedulers/base.py
    M master/buildbot/schedulers/basic.py
    M master/buildbot/test/unit/test_schedulers_basic.py
    M master/docs/manual/cfg-schedulers.rst
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  Merge branch 'sbs-abs-source-stamps' of git://github.com/thedylman/buildbot

  Commit: 39f59294e7144b6d15e8a99ad12d9230880aaf5d
      https://github.com/buildbot/buildbot/commit/39f59294e7144b6d15e8a99ad12d9230880aaf5d
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-06-14 (Fri, 14 Jun 2013)

  Changed paths:
    M master/docs/manual/cfg-properties.rst

  Log Message:
  -----------
  remove nonexistent sourcestamp properties

Fixes #2509.

  Commit: a7b937ee8119961dd6f87f18e4b53c76e307c274
      https://github.com/buildbot/buildbot/commit/a7b937ee8119961dd6f87f18e4b53c76e307c274
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-06-15 (Sat, 15 Jun 2013)

  Changed paths:
    M master/buildbot/scripts/base.py
    M master/buildbot/scripts/runner.py
    M slave/buildslave/scripts/runner.py

  Log Message:
  -----------
  Add comments explaining use of usage.Completions

  Commit: 6f12f1232c22f1a34da01cb01a65e6e2992d7438
      https://github.com/buildbot/buildbot/commit/6f12f1232c22f1a34da01cb01a65e6e2992d7438
  Author: Jared Grubb <jaredgrubb at gmail.com>
  Date:   2013-06-16 (Sun, 16 Jun 2013)

  Changed paths:
    M master/buildbot/buildslave/__init__.py
    A master/buildbot/db/buildslaves.py
    M master/buildbot/db/connector.py
    A master/buildbot/db/migrate/versions/024_add_buildslaves_table.py
    M master/buildbot/db/model.py
    A master/buildbot/db/types/json.py
    M master/buildbot/status/slave.py
    M master/buildbot/status/web/builder.py
    M master/buildbot/status/web/slaves.py
    M master/buildbot/test/fake/fakedb.py
    M master/buildbot/test/integration/test_slave_comm.py
    M master/buildbot/test/unit/test_buildslave.py
    A master/buildbot/test/unit/test_db_buildslaves.py
    A master/buildbot/test/unit/test_db_migrate_versions_024_add_buildslaves_table.py
    M master/buildbot/util/__init__.py
    M master/docs/developer/database.rst
    M master/docs/relnotes/index.rst
    A types/__init__.py b/master/buildbot/db/types/__init__.py

  Log Message:
  -----------
  Buildslaves: add buildslave information to the database

 - new buildslaves table
 - store the (admin, host, accessURI, version) in the database

  Commit: 110cdfb24c52cc95af8ee620c66540a384c22596
      https://github.com/buildbot/buildbot/commit/110cdfb24c52cc95af8ee620c66540a384c22596
  Author: jimbru <jim.brusstar at gmail.com>
  Date:   2013-06-18 (Tue, 18 Jun 2013)

  Changed paths:
    M master/buildbot/status/web/authz.py
    M master/buildbot/status/web/base.py
    M master/buildbot/status/web/templates/layout.html
    M master/buildbot/status/web/templates/root.html
    M master/docs/manual/cfg-statustargets.rst

  Log Message:
  -----------
  Add WebStatus authz "view" action.

This commit adds a new action to authz called "view". This action
represents the ability to view the Buildbot's WebStatus. If, for
example, you set `view='auth'` in authz, a user must be logged in to
view any meaningful status information.

The exception is that the root page and the login action are
whitelisted to always be viewable since these are necessary to log in.

Using this authz action it becomes possible to run a "private" Buildbot
instance for projects that don't wish to expose themselves to the
Internet at large.

  Commit: 6b7bc9f3ef8400873272f8c265e1fa6cd686d61b
      https://github.com/buildbot/buildbot/commit/6b7bc9f3ef8400873272f8c265e1fa6cd686d61b
  Author: Jared Grubb <jaredgrubb at gmail.com>
  Date:   2013-06-18 (Tue, 18 Jun 2013)

  Changed paths:
    M master/buildbot/buildslave/__init__.py
    M master/buildbot/db/buildslaves.py
    M master/buildbot/test/fake/fakedb.py
    M master/buildbot/test/unit/test_db_buildslaves.py
    M master/docs/developer/database.rst

  Log Message:
  -----------
  Buildslaves: change 'slavename' to 'name'

  Commit: 79f592721998b2608fcfe291138a3801f2bbb518
      https://github.com/buildbot/buildbot/commit/79f592721998b2608fcfe291138a3801f2bbb518
  Author: Vasily Litvinov <vasslitvinov at pisem.net>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

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

  Log Message:
  -----------
  Fixing popup in Console view in IE (verified against IE8)

  Commit: c85af173888d5756fbefb62121d973e8c6c03526
      https://github.com/buildbot/buildbot/commit/c85af173888d5756fbefb62121d973e8c6c03526
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-06-22 (Sat, 22 Jun 2013)

  Changed paths:
    M master/buildbot/status/web/authz.py
    M master/buildbot/status/web/base.py
    M master/buildbot/status/web/templates/layout.html
    M master/buildbot/status/web/templates/root.html
    M master/docs/manual/cfg-statustargets.rst
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  Merge branch '2_view_action' of git://github.com/jimbru/buildbot

  Commit: 8316bcd413d4e057183aa0ed222e8a7fe5b97a67
      https://github.com/buildbot/buildbot/commit/8316bcd413d4e057183aa0ed222e8a7fe5b97a67
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-06-23 (Sun, 23 Jun 2013)

  Changed paths:
    M master/buildbot/buildslave/__init__.py
    A master/buildbot/db/buildslaves.py
    M master/buildbot/db/connector.py
    A master/buildbot/db/migrate/versions/024_add_buildslaves_table.py
    M master/buildbot/db/model.py
    A master/buildbot/db/types/json.py
    M master/buildbot/status/slave.py
    M master/buildbot/status/web/builder.py
    M master/buildbot/status/web/slaves.py
    M master/buildbot/test/fake/fakedb.py
    M master/buildbot/test/integration/test_slave_comm.py
    M master/buildbot/test/unit/test_buildslave.py
    A master/buildbot/test/unit/test_db_buildslaves.py
    A master/buildbot/test/unit/test_db_migrate_versions_024_add_buildslaves_table.py
    M master/buildbot/util/__init__.py
    M master/docs/developer/database.rst
    M master/docs/relnotes/index.rst
    A types/__init__.py b/master/buildbot/db/types/__init__.py

  Log Message:
  -----------
  Merge branch 'BuildslaveDatabase' of git://github.com/jaredgrubb/buildbot

  Commit: b674e1328e6d43d8444f57f53feedfb768106b3a
      https://github.com/buildbot/buildbot/commit/b674e1328e6d43d8444f57f53feedfb768106b3a
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-06-23 (Sun, 23 Jun 2013)

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

  Log Message:
  -----------
  don't use assertIsNotNone, which doesn't exist in older pythons

  Commit: 3b5b82282cb1ccc812b0877921d653e6e99349f2
      https://github.com/buildbot/buildbot/commit/3b5b82282cb1ccc812b0877921d653e6e99349f2
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-06-23 (Sun, 23 Jun 2013)

  Changed paths:
    M master/setup.py

  Log Message:
  -----------
  sqlalchemy-0.7.10 seems fine, too

  Commit: c759ea50b09432db3754d998ab4e099de765d51b
      https://github.com/buildbot/buildbot/commit/c759ea50b09432db3754d998ab4e099de765d51b
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-06-23 (Sun, 23 Jun 2013)

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

  Log Message:
  -----------
  Merge branch 'console_ie_fix' of git://github.com/JustAMan/buildbot

  Commit: 3c48c877ff3b8464a64b913fbcbcfb57612617db
      https://github.com/buildbot/buildbot/commit/3c48c877ff3b8464a64b913fbcbcfb57612617db
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-06-23 (Sun, 23 Jun 2013)

  Changed paths:
    M master/buildbot/db/migrate/versions/024_add_buildslaves_table.py
    M master/buildbot/db/model.py
    M master/buildbot/test/unit/test_db_buildslaves.py
    M master/buildbot/test/unit/test_db_migrate_versions_024_add_buildslaves_table.py

  Log Message:
  -----------
  db fixes for buildslaves improvements

  Commit: 3b1e40278df96ec38e95b7ea001d6d91c2e4306d
      https://github.com/buildbot/buildbot/commit/3b1e40278df96ec38e95b7ea001d6d91c2e4306d
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-06-23 (Sun, 23 Jun 2013)

  Changed paths:
    M common/generate_buildbot_api_documentation.sh
    M master/buildbot/buildslave/__init__.py
    A master/buildbot/db/buildslaves.py
    M master/buildbot/db/connector.py
    A master/buildbot/db/migrate/versions/024_add_buildslaves_table.py
    R master/buildbot/db/migrate/versions/024_add_master_table.py
    A master/buildbot/db/migrate/versions/025_add_master_table.py
    R master/buildbot/db/migrate/versions/025_add_schedulers_table.py
    A master/buildbot/db/migrate/versions/026_add_schedulers_table.py
    R master/buildbot/db/migrate/versions/026_builders_table.py
    A master/buildbot/db/migrate/versions/027_builders_table.py
    R master/buildbot/db/migrate/versions/027_sourcestamps_refactor.py
    R master/buildbot/db/migrate/versions/028_replace_builds_table.py
    A master/buildbot/db/migrate/versions/028_sourcestamps_refactor.py
    A master/buildbot/db/migrate/versions/029_replace_builds_table.py
    R master/buildbot/db/migrate/versions/029_statusdb_tables.py
    R master/buildbot/db/migrate/versions/030_add_changesources_table.py
    A master/buildbot/db/migrate/versions/030_statusdb_tables.py
    A master/buildbot/db/migrate/versions/031_add_changesources_table.py
    M master/buildbot/db/model.py
    M master/buildbot/db/schedulers.py
    A master/buildbot/db/types/json.py
    M master/buildbot/master.py
    M master/buildbot/monkeypatches/__init__.py
    M master/buildbot/process/botmaster.py
    M master/buildbot/process/build.py
    M master/buildbot/process/builder.py
    M master/buildbot/process/buildrequestdistributor.py
    M master/buildbot/process/buildstep.py
    M master/buildbot/process/factory.py
    M master/buildbot/schedulers/base.py
    M master/buildbot/schedulers/basic.py
    M master/buildbot/schedulers/forcesched.py
    M master/buildbot/scripts/base.py
    M master/buildbot/scripts/runner.py
    M master/buildbot/status/slave.py
    M master/buildbot/status/web/authz.py
    M master/buildbot/status/web/base.py
    M master/buildbot/status/web/builder.py
    M master/buildbot/status/web/grid.py
    M master/buildbot/status/web/slaves.py
    M master/buildbot/status/web/templates/console.html
    M master/buildbot/status/web/templates/layout.html
    M master/buildbot/status/web/templates/root.html
    M master/buildbot/status/words.py
    M master/buildbot/steps/python_twisted.py
    M master/buildbot/steps/slave.py
    M master/buildbot/steps/source/git.py
    M master/buildbot/steps/source/oldsource.py
    M master/buildbot/steps/source/repo.py
    M master/buildbot/test/fake/fakedata.py
    M master/buildbot/test/fake/fakedb.py
    M master/buildbot/test/integration/test_slave_comm.py
    M master/buildbot/test/unit/test_buildslave.py
    A master/buildbot/test/unit/test_db_buildslaves.py
    A master/buildbot/test/unit/test_db_migrate_versions_024_add_buildslaves_table.py
    R master/buildbot/test/unit/test_db_migrate_versions_024_add_master_table.py
    A master/buildbot/test/unit/test_db_migrate_versions_025_add_master_table.py
    R master/buildbot/test/unit/test_db_migrate_versions_025_add_schedulers_table.py
    A master/buildbot/test/unit/test_db_migrate_versions_026_add_schedulers_table.py
    R master/buildbot/test/unit/test_db_migrate_versions_026_builders_table.py
    A master/buildbot/test/unit/test_db_migrate_versions_027_builders_table.py
    R master/buildbot/test/unit/test_db_migrate_versions_027_sourcestamps_refactor.py
    R master/buildbot/test/unit/test_db_migrate_versions_028_replace_builds_table.py
    A master/buildbot/test/unit/test_db_migrate_versions_028_sourcestamps_refactor.py
    A master/buildbot/test/unit/test_db_migrate_versions_029_replace_builds_table.py
    R master/buildbot/test/unit/test_db_migrate_versions_029_statusdb_tables.py
    R master/buildbot/test/unit/test_db_migrate_versions_030_add_changesources_table.py
    A master/buildbot/test/unit/test_db_migrate_versions_030_statusdb_tables.py
    A master/buildbot/test/unit/test_db_migrate_versions_031_add_changesources_table.py
    M master/buildbot/test/unit/test_process_build.py
    M master/buildbot/test/unit/test_process_builder.py
    M master/buildbot/test/unit/test_process_buildrequestdistributor_BuildRequestDistributor.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_scripts_restart.py
    M master/buildbot/test/unit/test_scripts_runner.py
    M master/buildbot/test/unit/test_status_words.py
    M master/buildbot/test/unit/test_steps_master.py
    M master/buildbot/test/unit/test_steps_slave.py
    M master/buildbot/test/unit/test_steps_source_svn.py
    M master/buildbot/test/unit/test_util_maildir.py
    M master/buildbot/test/util/scheduler.py
    M master/buildbot/util/__init__.py
    M master/buildbot/util/maildir.py
    M master/buildbot/util/state.py
    M master/contrib/README.txt
    A master/contrib/SimpleConfig.py
    A master/contrib/bash/buildbot
    A master/contrib/zsh/_buildbot
    M master/docs/developer/cls-basescheduler.rst
    M master/docs/developer/db.rst
    M master/docs/manual/cfg-builders.rst
    M master/docs/manual/cfg-buildsteps.rst
    M master/docs/manual/cfg-properties.rst
    M master/docs/manual/cfg-schedulers.rst
    M master/docs/manual/cfg-statustargets.rst
    M master/docs/manual/installation.rst
    M master/docs/relnotes/0.8.7.rst
    M master/docs/relnotes/0.8.8.rst
    M master/docs/relnotes/index.rst
    M master/docs/tutorial/fiveminutes.rst
    M master/docs/tutorial/further.rst
    M master/setup.py
    M slave/buildslave/monkeypatches/__init__.py
    M slave/buildslave/scripts/create_slave.py
    M slave/buildslave/scripts/runner.py
    A slave/contrib/README.txt
    A slave/contrib/bash/buildslave
    A slave/contrib/zsh/_buildslave
    A types/__init__.py b/master/buildbot/db/types/__init__.py

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

Conflicts:
	master/buildbot/db/connector.py
	master/buildbot/db/schedulers.py
	master/buildbot/master.py
	master/buildbot/process/buildrequestdistributor.py
	master/buildbot/schedulers/base.py
	master/buildbot/schedulers/basic.py
	master/buildbot/schedulers/forcesched.py
	master/buildbot/test/fake/fakedb.py
	master/buildbot/test/integration/test_slave_comm.py
	master/buildbot/test/unit/test_process_builder.py
	master/buildbot/test/unit/test_process_buildrequestdistributor_BuildRequestDistributor.py

  Commit: 3a3e170db5d991b1b967d24e7bbc645ef417f78d
      https://github.com/buildbot/buildbot/commit/3a3e170db5d991b1b967d24e7bbc645ef417f78d
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-06-23 (Sun, 23 Jun 2013)

  Changed paths:
    M master/buildbot/test/integration/test_www.py

  Log Message:
  -----------
  support twisteds that do not have HTTPConnectionPools

Compare: https://github.com/buildbot/buildbot/compare/210a9636f0bc...3a3e170db5d9