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

[GitHub]

  Branch: refs/heads/nine
  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: 4d586eea077de69c0232349550a8794485f5c120
      https://github.com/buildbot/buildbot/commit/4d586eea077de69c0232349550a8794485f5c120
  Author: Tjerk Santegoeds <tsan at tdias.com>
  Date:   2014-04-01 (Tue, 01 Apr 2014)

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

  Log Message:
  -----------
  Support an empty SVN password


  Commit: dfaeeb2f865ced2d8a681737b9739711771a26af
      https://github.com/buildbot/buildbot/commit/dfaeeb2f865ced2d8a681737b9739711771a26af
  Author: Tjerk Santegoeds <tsan at tdias.com>
  Date:   2014-04-03 (Thu, 03 Apr 2014)

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

  Log Message:
  -----------
  Further change to support empty SVN passwords.


  Commit: b939e61798c7284e7755cef2e91f6fd69de88998
      https://github.com/buildbot/buildbot/commit/b939e61798c7284e7755cef2e91f6fd69de88998
  Author: Tjerk Santegoeds <tsan at tdias.com>
  Date:   2014-04-03 (Thu, 03 Apr 2014)

  Changed paths:
    M master/buildbot/test/unit/test_steps_source_svn.py

  Log Message:
  -----------
  Add unit test for empty SVN password.


  Commit: e5ca28ed13e5ef4d370558e866907d4d15076bcd
      https://github.com/buildbot/buildbot/commit/e5ca28ed13e5ef4d370558e866907d4d15076bcd
  Author: Dustin J. Mitchell <dustin at buildbot.net>
  Date:   2014-04-03 (Thu, 03 Apr 2014)

  Changed paths:
    M master/docs/manual/cfg-schedulers.rst
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  add documentation for Force Scheduler's 'buttonName' argument


  Commit: 1e98fb44e5ef058c4938efd703c2346632a96c46
      https://github.com/buildbot/buildbot/commit/1e98fb44e5ef058c4938efd703c2346632a96c46
  Author: Dustin J. Mitchell <dustin at buildbot.net>
  Date:   2014-04-03 (Thu, 03 Apr 2014)

  Changed paths:
    M master/buildbot/steps/source/svn.py
    M master/buildbot/test/unit/test_steps_source_svn.py

  Log Message:
  -----------
  Merge santegoeds/buildbot:support-empty-svn-password (PR #1117)


  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


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

  Changed paths:
    M master/buildbot/steps/source/svn.py
    M master/buildbot/test/unit/test_steps_source_svn.py
    M master/docs/manual/cfg-schedulers.rst
    M master/docs/relnotes/index.rst

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


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

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


Compare: https://github.com/buildbot/buildbot/compare/994b7488af5a...d0542afa9fcc