[Buildbot-commits] [buildbot/buildbot] 64e51d: Un-Revert and put back: "Merge branch 'SlaveInfo' ...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/buildbot/buildbot
  Commit: 64e51d464cd699bff41bb6e6eb4bb5160c4bd600
      https://github.com/buildbot/buildbot/commit/64e51d464cd699bff41bb6e6eb4bb5160c4bd600
  Author: Jared Grubb <jaredgrubb at gmail.com>
  Date:   2014-03-25 (Tue, 25 Mar 2014)

  Changed paths:
    M master/buildbot/buildslave/base.py
    M master/buildbot/process/properties.py
    M master/buildbot/status/slave.py
    M master/buildbot/steps/master.py
    M master/buildbot/test/fake/fakedb.py
    M master/buildbot/test/unit/test_buildslave_base.py
    M master/buildbot/test/unit/test_process_properties.py
    A master/buildbot/test/unit/test_status_slave.py
    M master/docs/manual/cfg-buildsteps.rst
    M master/docs/manual/cfg-properties.rst
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  Un-Revert and put back: "Merge branch 'SlaveInfo' of git://github.com/jaredgrubb/buildbot""

This reverts commit f518276b3a6e88a6b079a4e2661a152087eedd15.

Conflicts:
	master/buildbot/test/unit/test_buildslave_base.py


  Commit: 15f9c38f5b6b6b443513ffcea5309ba2cd00389c
      https://github.com/buildbot/buildbot/commit/15f9c38f5b6b6b443513ffcea5309ba2cd00389c
  Author: Jared Grubb <jaredgrubb at gmail.com>
  Date:   2014-03-25 (Tue, 25 Mar 2014)

  Changed paths:
    M master/buildbot/steps/master.py

  Log Message:
  -----------
  SetSlaveInfo: fix bug in implemenation


  Commit: 75c6cd6d36358fb2caa490b05e3193c4aa4d5d13
      https://github.com/buildbot/buildbot/commit/75c6cd6d36358fb2caa490b05e3193c4aa4d5d13
  Author: Jared Grubb <jgrubb at apple.com>
  Date:   2014-03-25 (Tue, 25 Mar 2014)

  Changed paths:
    M master/buildbot/status/web/slaves.py
    M master/buildbot/status/web/templates/buildslave.html

  Log Message:
  -----------
  Add the 'slave info' table to the buildslave web page


  Commit: 4128f2f7c572adb854adb0eebddccc0285c99b9f
      https://github.com/buildbot/buildbot/commit/4128f2f7c572adb854adb0eebddccc0285c99b9f
  Author: Dustin J. Mitchell <dustin at buildbot.net>
  Date:   2014-04-05 (Sat, 05 Apr 2014)

  Changed paths:
    M master/buildbot/buildslave/base.py
    M master/buildbot/process/properties.py
    M master/buildbot/status/slave.py
    M master/buildbot/status/web/slaves.py
    M master/buildbot/status/web/templates/buildslave.html
    M master/buildbot/steps/master.py
    M master/buildbot/test/fake/fakedb.py
    M master/buildbot/test/unit/test_buildslave_base.py
    M master/buildbot/test/unit/test_process_properties.py
    A master/buildbot/test/unit/test_status_slave.py
    M master/docs/manual/cfg-buildsteps.rst
    M master/docs/manual/cfg-properties.rst
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  Merge jaredgrubb/buildbot:SlaveInfo-UnRevert (PR #1109)

+autopep8


Compare: https://github.com/buildbot/buildbot/compare/1e98fb44e5ef...4128f2f7c572