[Buildbot-commits] [buildbot/buildbot] 2b6708: Merge branch 'missing-buildslave-properties' of gi...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/buildbot/buildbot
  Commit: 2b6708eb90165f48a815d9a7e422971899fc1208
      https://github.com/buildbot/buildbot/commit/2b6708eb90165f48a815d9a7e422971899fc1208
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2012-03-13 (Tue, 13 Mar 2012)

  Changed paths:
    M master/buildbot/buildslave.py
  M master/buildbot/test/unit/test_buildslave.py

  Log Message:
  -----------
  Merge branch 'missing-buildslave-properties' of git://github.com/tomprince/buildbot into buildbot-0.8.6

* 'missing-buildslave-properties' of git://github.com/tomprince/buildbot:
  Fix population of slave properties on initial config.


  Commit: 9224d77e7b6f71c7dd156939f476d251090d9d07
      https://github.com/buildbot/buildbot/commit/9224d77e7b6f71c7dd156939f476d251090d9d07
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2012-03-13 (Tue, 13 Mar 2012)

  Changed paths:
    M master/buildbot/buildslave.py
  M master/buildbot/test/unit/test_buildslave.py

  Log Message:
  -----------
  Merge branch 'buildbot-0.8.6'

* buildbot-0.8.6:
  Fix population of slave properties on initial config.

Conflicts:
	master/buildbot/test/unit/test_buildslave.py
  (inlineCallbacks vs. deferredGenerator)


Compare: https://github.com/buildbot/buildbot/compare/e4c2d26...9224d77