[Buildbot-commits] [buildbot/buildbot] effe04: Correctly handle the result of a DeferredList in s...

[GitHub]

  Branch: refs/heads/nine
  Home:   https://github.com/buildbot/buildbot
  Commit: effe0435511de0322e67dfa36b8f2f069be64eeb
      https://github.com/buildbot/buildbot/commit/effe0435511de0322e67dfa36b8f2f069be64eeb
  Author: Dustin J. Mitchell <dustin at buildbot.net>
  Date:   2014-05-26 (Mon, 26 May 2014)

  Changed paths:
    M master/contrib/svn_buildbot.py

  Log Message:
  -----------
  Correctly handle the result of a DeferredList in svn_buildbot.py

Fixes #2766.


  Commit: d7bbfb32c534247a12778564899a57cd89a4c7e9
      https://github.com/buildbot/buildbot/commit/d7bbfb32c534247a12778564899a57cd89a4c7e9
  Author: Dustin J. Mitchell <dustin at buildbot.net>
  Date:   2014-05-26 (Mon, 26 May 2014)

  Changed paths:
    A master/buildbot/test/unit/test_util_identifiers.py
    A master/buildbot/util/identifiers.py
    M master/docs/developer/utils.rst

  Log Message:
  -----------
  backport buildbot.util.identifiers from nine


  Commit: 0efac3e18392fc3860277b8de5594691ba514d4f
      https://github.com/buildbot/buildbot/commit/0efac3e18392fc3860277b8de5594691ba514d4f
  Author: Dustin J. Mitchell <dustin at buildbot.net>
  Date:   2014-05-26 (Mon, 26 May 2014)

  Changed paths:
    M master/buildbot/db/users.py
    M master/buildbot/test/unit/test_db_users.py

  Log Message:
  -----------
  Unique-ify user identifiers when attributes do not agree.

This solves the problem when two users happen to have the same
"suggested" identifier (the first argument to findUserByAttr).
Fixes #2587.


  Commit: 09742178ff4f00a5cd705cf17a98eda82bd624fb
      https://github.com/buildbot/buildbot/commit/09742178ff4f00a5cd705cf17a98eda82bd624fb
  Author: Dustin J. Mitchell <dustin at buildbot.net>
  Date:   2014-05-26 (Mon, 26 May 2014)

  Changed paths:
    M master/docs/developer/utils.rst

  Log Message:
  -----------
  identifiers aren't defined in this version


  Commit: bf2fb73ded9cdf4be8a4f97aae499e203712d6ea
      https://github.com/buildbot/buildbot/commit/bf2fb73ded9cdf4be8a4f97aae499e203712d6ea
  Author: Dustin J. Mitchell <dustin at buildbot.net>
  Date:   2014-05-26 (Mon, 26 May 2014)

  Changed paths:
    M master/buildbot/db/users.py
    M master/buildbot/test/unit/test_db_users.py
    A master/buildbot/test/unit/test_util_identifiers.py
    A master/buildbot/util/identifiers.py
    M master/contrib/svn_buildbot.py
    M master/docs/developer/utils.rst

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


  Commit: 41c7715df86e9aeff0c6a3d2675fa927b1c50630
      https://github.com/buildbot/buildbot/commit/41c7715df86e9aeff0c6a3d2675fa927b1c50630
  Author: Dustin J. Mitchell <dustin at buildbot.net>
  Date:   2014-05-26 (Mon, 26 May 2014)

  Changed paths:
    M master/buildbot/db/users.py
    M master/buildbot/test/unit/test_db_users.py
    M master/contrib/svn_buildbot.py

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

Conflicts:
	master/buildbot/db/users.py
	master/docs/developer/utils.rst


Compare: https://github.com/buildbot/buildbot/compare/05ef1d26662f...41c7715df86e