[Buildbot-commits] [buildbot/buildbot] 97d837: Merge buildbot_json.py from upstream at r157823.

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/buildbot/buildbot
  Commit: 97d837d80b208ecc3e14209dc466db618c2254c7
      https://github.com/buildbot/buildbot/commit/97d837d80b208ecc3e14209dc466db618c2254c7
  Author: Marc-Antoine Ruel <maruel at chromium.org>
  Date:   2012-09-21 (Fri, 21 Sep 2012)

  Changed paths:
    M master/contrib/buildbot_json.py

  Log Message:
  -----------
  Merge buildbot_json.py from upstream at r157823.

Adds the command count.
Fixes multiple bugs.


  Commit: 6a0fea1bbfad358e3cfe6053c01a1b61a1ad520d
      https://github.com/buildbot/buildbot/commit/6a0fea1bbfad358e3cfe6053c01a1b61a1ad520d
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

  Changed paths:
    M master/contrib/buildbot_json.py

  Log Message:
  -----------
  Merge branch 'update_buildbot_json' of git://github.com/maruel/buildbot


Compare: https://github.com/buildbot/buildbot/compare/d3c9e142c56b...6a0fea1bbfad