[Buildbot-commits] [buildbot/buildbot] 9cc65c: Merge remote-tracking branch 'upstream/master'

noreply at github.com noreply at github.com
Mon Nov 14 16:35:56 UTC 2011 

  Branch: refs/heads/master
  Home:   https://github.com/buildbot/buildbot

  Commit: 9cc65c3397b1f4f5acfab130c6f28c06af49b7ea
      https://github.com/buildbot/buildbot/commit/9cc65c3397b1f4f5acfab130c6f28c06af49b7ea
  Author: Andi Albrecht <albrecht.andi at gmail.com>
  Date:   2011-11-14 (Mon, 14 Nov 2011)

  Changed paths:
    M master/NEWS
  M master/buildbot/buildslave.py
  M master/buildbot/changes/manager.py
  M master/buildbot/changes/pb.py
  M master/buildbot/config.py
  M master/buildbot/db/connector.py
  M master/buildbot/db/exceptions.py
  M master/buildbot/interfaces.py
  M master/buildbot/master.py
  M master/buildbot/pbmanager.py
  M master/buildbot/process/botmaster.py
  M master/buildbot/process/build.py
  M master/buildbot/process/builder.py
  M master/buildbot/process/cache.py
  M master/buildbot/process/debug.py
  M master/buildbot/process/metrics.py
  M master/buildbot/process/users/manager.py
  M master/buildbot/schedulers/base.py
  M master/buildbot/schedulers/basic.py
  M master/buildbot/schedulers/dependent.py
  M master/buildbot/schedulers/manager.py
  M master/buildbot/schedulers/timed.py
  M master/buildbot/scripts/checkconfig.py
  M master/buildbot/scripts/runner.py
  M master/buildbot/scripts/startup.py
  M master/buildbot/status/base.py
  M master/buildbot/status/build.py
  M master/buildbot/status/builder.py
  M master/buildbot/status/buildstep.py
  M master/buildbot/status/logfile.py
  M master/buildbot/status/mail.py
  M master/buildbot/status/master.py
  M master/buildbot/status/web/baseweb.py
  M master/buildbot/status/web/files/robots.txt
  M master/buildbot/status/web/status_json.py
  M master/buildbot/steps/blocker.py
  M master/buildbot/steps/maxq.py
  M master/buildbot/steps/python.py
  M master/buildbot/steps/shell.py
  M master/buildbot/steps/transfer.py
  M master/buildbot/steps/trigger.py
  M master/buildbot/test/fake/fakedb.py
  M master/buildbot/test/fake/fakemaster.py
  M master/buildbot/test/integration/test_configs.py
  M master/buildbot/test/integration/test_slave_comm.py
  M master/buildbot/test/integration/test_upgrade.py
  M master/buildbot/test/regressions/test_import_unicode_changes.py
  M master/buildbot/test/regressions/test_shell_command_properties.py
  R master/buildbot/test/unit/test_blocker.py
  M master/buildbot/test/unit/test_buildslave.py
  M master/buildbot/test/unit/test_changes_manager.py
  M master/buildbot/test/unit/test_changes_pb.py
  A master/buildbot/test/unit/test_config.py
  M master/buildbot/test/unit/test_db_connector.py
  M master/buildbot/test/unit/test_master.py
  M master/buildbot/test/unit/test_process_botmaster_BotMaster.py
  M master/buildbot/test/unit/test_process_botmaster_BuildRequestDistributor.py
  M master/buildbot/test/unit/test_process_builder.py
  M master/buildbot/test/unit/test_process_cache.py
  M master/buildbot/test/unit/test_process_debug.py
  M master/buildbot/test/unit/test_process_metrics.py
  M master/buildbot/test/unit/test_process_users_manager.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_manager.py
  M master/buildbot/test/unit/test_schedulers_timed_Nightly.py
  M master/buildbot/test/unit/test_schedulers_timed_Periodic.py
  M master/buildbot/test/unit/test_scripts_checkconfig.py
  M master/buildbot/test/unit/test_scripts_runner.py
  M master/buildbot/test/unit/test_status_build.py
  M master/buildbot/test/unit/test_status_buildstep.py
  M master/buildbot/test/unit/test_status_logfile.py
  M master/buildbot/test/unit/test_status_mail.py
  M master/buildbot/test/unit/test_status_master.py
  A master/buildbot/test/unit/test_steps_blocker.py
  M master/buildbot/test/unit/test_steps_maxq.py
  M master/buildbot/test/unit/test_steps_python.py
  M master/buildbot/test/unit/test_steps_shell.py
  M master/buildbot/test/unit/test_steps_transfer.py
  M master/buildbot/test/unit/test_steps_trigger.py
  M master/buildbot/test/unit/test_util.py
  M master/buildbot/test/util/pbmanager.py
  M master/buildbot/util/__init__.py
  M master/docs/bbdocs/ext.py
  M master/docs/developer/config.rst
  M master/docs/developer/database.rst
  M master/docs/developer/master-overview.rst
  M master/docs/developer/utils.rst
  M master/docs/index.rst
  M master/docs/manual/cfg-changesources.rst
  M master/docs/manual/cfg-global.rst
  M master/docs/manual/cfg-schedulers.rst
  M master/docs/manual/cfg-statustargets.rst
  M master/docs/manual/installation.rst
  A master/docs/release-notes.rst
  A master/docs/release-notes/0.3.1.txt
  A master/docs/release-notes/0.3.2.txt
  A master/docs/release-notes/0.3.3.txt
  A master/docs/release-notes/0.3.4.txt
  A master/docs/release-notes/0.3.5.txt
  A master/docs/release-notes/0.4.0.txt
  A master/docs/release-notes/0.4.1.txt
  A master/docs/release-notes/0.4.2.txt
  A master/docs/release-notes/0.4.3.txt
  A master/docs/release-notes/0.5.0.txt
  A master/docs/release-notes/0.6.0.txt
  A master/docs/release-notes/0.6.1.txt
  A master/docs/release-notes/0.6.2.txt
  A master/docs/release-notes/0.6.3.txt
  A master/docs/release-notes/0.6.4.txt
  A master/docs/release-notes/0.6.5.txt
  A master/docs/release-notes/0.6.6.txt
  A master/docs/release-notes/0.7.0.txt
  A master/docs/release-notes/0.7.1.txt
  A master/docs/release-notes/0.7.10.txt
  A master/docs/release-notes/0.7.11.txt
  A master/docs/release-notes/0.7.12.txt
  A master/docs/release-notes/0.7.2.txt
  A master/docs/release-notes/0.7.3.txt
  A master/docs/release-notes/0.7.4.txt
  A master/docs/release-notes/0.7.5.txt
  A master/docs/release-notes/0.7.6.txt
  A master/docs/release-notes/0.7.7.txt
  A master/docs/release-notes/0.7.8.txt
  A master/docs/release-notes/0.7.9.txt
  A master/docs/release-notes/0.8.0.txt
  A master/docs/release-notes/0.8.1.txt
  A master/docs/release-notes/0.8.2.txt
  A master/docs/release-notes/0.8.3.txt
  A master/docs/release-notes/0.8.4.txt
  A master/docs/release-notes/0.8.5.txt
  M slave/NEWS
  M slave/buildslave/runprocess.py
  M slave/buildslave/test/fake/slavebuilder.py
  M slave/buildslave/test/unit/test_runprocess.py

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


  Commit: 43ebc294c414b389181b8e78ff4e8b8ff1aaca5b
      https://github.com/buildbot/buildbot/commit/43ebc294c414b389181b8e78ff4e8b8ff1aaca5b
  Author: Andi Albrecht <albrecht.andi at gmail.com>
  Date:   2011-11-14 (Mon, 14 Nov 2011)

  Changed paths:
    M master/buildbot/status/mail.py

  Log Message:
  -----------
  Make LOG_ENCODING a module constant.


  Commit: 7497effe5283d0ff051947f922f79fbb05259295
      https://github.com/buildbot/buildbot/commit/7497effe5283d0ff051947f922f79fbb05259295
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2011-11-14 (Mon, 14 Nov 2011)

  Changed paths:
    M master/buildbot/status/mail.py
  M master/buildbot/test/unit/test_status_mail.py

  Log Message:
  -----------
  Merge branch 'master' of git://github.com/andialbrecht/buildbot

* 'master' of git://github.com/andialbrecht/buildbot:
  Make LOG_ENCODING a module constant.
  Decode str before encoding when a log is added as mail attachment (fixes #2143).


Compare: https://github.com/buildbot/buildbot/compare/d14f92d...7497eff

More information about the Commits mailing list