[Buildbot-commits] [buildbot/buildbot] 58eb0d: Merge branch 'json_changes' of git://github.com/ta...

[noreply at github.com]

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

  Commit: 58eb0d5f40e95dc12f6be2001b084fb4acd5c2a9
      https://github.com/buildbot/buildbot/commit/58eb0d5f40e95dc12f6be2001b084fb4acd5c2a9
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2011-11-17 (Thu, 17 Nov 2011)

  Changed paths:
    M master/buildbot/status/builder.py
  M master/buildbot/status/web/status_json.py

  Log Message:
  -----------
  Merge branch 'json_changes' of git://github.com/tardyp/buildbot

* 'json_changes' of git://github.com/tardyp/buildbot:
  builder: add information about schedulers in asDict
  status_json: add numbuilds argument in slave