[Buildbot-commits] [buildbot/buildbot] c815fc: fix merge error regarding id key in buildslavedict...

[GitHub]

  Branch: refs/heads/nine
  Home:   https://github.com/buildbot/buildbot
  Commit: c815fc9b3b142526b5506037c379ad240b164631
      https://github.com/buildbot/buildbot/commit/c815fc9b3b142526b5506037c379ad240b164631
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-07-06 (Sat, 06 Jul 2013)

  Changed paths:
    M master/buildbot/test/unit/test_db_buildslaves.py
    M master/docs/developer/db.rst

  Log Message:
  -----------
  fix merge error regarding id key in buildslavedicts