[Buildbot-commits] [buildbot/buildbot] db1710: Small fix in comment for 'codebase'.

[GitHub]

  Branch: refs/heads/nine
  Home:   https://github.com/buildbot/buildbot
  Commit: db1710f2fc2558ae7077d42dba11c07a4e8451f3
      https://github.com/buildbot/buildbot/commit/db1710f2fc2558ae7077d42dba11c07a4e8451f3
  Author: enribop78 <enribop78 at gmail.com>
  Date:   2014-03-20 (Thu, 20 Mar 2014)

  Changed paths:
    M master/contrib/git_buildbot.py

  Log Message:
  -----------
  Small fix in comment for 'codebase'.


  Commit: 43518c4236fd72a377c4af309bca74058f06f1d7
      https://github.com/buildbot/buildbot/commit/43518c4236fd72a377c4af309bca74058f06f1d7
  Author: Pierre Tardy <tardyp at gmail.com>
  Date:   2014-03-20 (Thu, 20 Mar 2014)

  Changed paths:
    M master/contrib/git_buildbot.py

  Log Message:
  -----------
  Merge pull request #1102 from enribop78/comment-fix

Small fix in comment for 'codebase'.


  Commit: aaad8a088bd6006e908ff8411d556c50023bf08f
      https://github.com/buildbot/buildbot/commit/aaad8a088bd6006e908ff8411d556c50023bf08f
  Author: Dustin J. Mitchell <dustin at buildbot.net>
  Date:   2014-03-23 (Sun, 23 Mar 2014)

  Changed paths:
    M master/buildbot/status/mail.py
    M master/buildbot/test/unit/test_status_mail.py
    M master/docs/manual/cfg-statustargets.rst

  Log Message:
  -----------
  Revert "Merge varunsharma/buildbot:master (PR #1097)"

This reverts commit c39caeed39c251f15d4a0102cee1a5af95778d49, reversing
changes made to 66784b87b7991f470f9dce5206894737e154c3aa.


  Commit: 7b69e8a38504000b32a52571665150b5d6e6c2bd
      https://github.com/buildbot/buildbot/commit/7b69e8a38504000b32a52571665150b5d6e6c2bd
  Author: Dustin J. Mitchell <dustin at buildbot.net>
  Date:   2014-03-23 (Sun, 23 Mar 2014)

  Changed paths:
    M master/buildbot/process/properties.py
    M master/buildbot/test/unit/test_process_build.py
    M master/buildbot/test/unit/test_process_properties.py

  Log Message:
  -----------
  Rename props.has_propkey back to props.has_key

This was renamed in 03e1d28, but that was too much.  Pep8 was only
complaining about calls to has_key when 'in' is better.


  Commit: 919f8ce0cf92a6522ce212c8ed54001f29155df7
      https://github.com/buildbot/buildbot/commit/919f8ce0cf92a6522ce212c8ed54001f29155df7
  Author: Pierre Bourdon <delroth at dolphin-emu.org>
  Date:   2014-03-24 (Mon, 24 Mar 2014)

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

  Log Message:
  -----------
  Try_Jobdir: fix a race condition

Wait for the sourcestamp to be written in the database before adding a buildset
that refers to it.


  Commit: e406a02a61619133819547ad9c26660bb602c781
      https://github.com/buildbot/buildbot/commit/e406a02a61619133819547ad9c26660bb602c781
  Author: Dustin J. Mitchell <dustin at buildbot.net>
  Date:   2014-03-24 (Mon, 24 Mar 2014)

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

  Log Message:
  -----------
  Merge delroth/buildbot:tryjobdir-race-condition (PR #1108)


  Commit: 66d8882509c3cbcaefc4242d1daf5504f602473d
      https://github.com/buildbot/buildbot/commit/66d8882509c3cbcaefc4242d1daf5504f602473d
  Author: Dustin J. Mitchell <dustin at buildbot.net>
  Date:   2014-03-24 (Mon, 24 Mar 2014)

  Changed paths:
    M master/buildbot/process/properties.py
    M master/buildbot/status/mail.py
    M master/buildbot/test/unit/test_process_build.py
    M master/buildbot/test/unit/test_process_properties.py
    M master/buildbot/test/unit/test_status_mail.py
    M master/contrib/git_buildbot.py
    M master/docs/manual/cfg-statustargets.rst

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

Conflicts:
	master/buildbot/schedulers/trysched.py
	master/buildbot/status/mail.py


  Commit: d6b9ef72d6c5dd6367f7508763ec787210f4c9bc
      https://github.com/buildbot/buildbot/commit/d6b9ef72d6c5dd6367f7508763ec787210f4c9bc
  Author: Dustin J. Mitchell <dustin at buildbot.net>
  Date:   2014-03-24 (Mon, 24 Mar 2014)

  Changed paths:
    M master/contrib/git_buildbot.py

  Log Message:
  -----------
  fix pylint errors


  Commit: 2dceb6432150e46b68ee26796092ab7914440039
      https://github.com/buildbot/buildbot/commit/2dceb6432150e46b68ee26796092ab7914440039
  Author: Dustin J. Mitchell <dustin at buildbot.net>
  Date:   2014-03-24 (Mon, 24 Mar 2014)

  Changed paths:
    M master/contrib/git_buildbot.py

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


Compare: https://github.com/buildbot/buildbot/compare/4d9f5d68cd9f...2dceb6432150