[Buildbot-commits] [djmitche/buildbot] c8b213: Merge commit 'origin/master'

[noreply at github.com]

Branch: refs/heads/master
Home:   http://github.com/djmitche/buildbot

Commit: c8b2133950e50e7a79dc3f67c945209fde940735
    http://github.com/djmitche/buildbot/commit/c8b2133950e50e7a79dc3f67c945209fde940735
Author: Daniel Dunbar <daniel at zuster.org>
Date:   2009-12-20 (Sun, 20 Dec 2009)

Changed paths:
  M buildbot/locks.py
  M buildbot/process/builder.py

Log Message:
-----------
Merge commit 'origin/master'


Commit: 801803f0e55adc70a175433e189c15ba596d2f81
    http://github.com/djmitche/buildbot/commit/801803f0e55adc70a175433e189c15ba596d2f81
Author: Daniel Dunbar <daniel at zuster.org>
Date:   2009-12-27 (Sun, 27 Dec 2009)

Changed paths:
  A buildbot/config.py
  M buildbot/master.py
  M buildbot/status/web/baseweb.py
  M buildbot/status/web/console.py
  M buildbot/test/test_config.py
  M buildbot/test/test_console.py
  M buildbot/test/test_control.py
  M buildbot/test/test_dependencies.py
  M buildbot/test/test_ec2buildslave.py
  M buildbot/test/test_limitlogs.py
  M buildbot/test/test_locks.py
  M buildbot/test/test_mergerequests.py
  M buildbot/test/test_ordering.py
  M buildbot/test/test_properties.py
  M buildbot/test/test_reconfig.py
  M buildbot/test/test_run.py
  M buildbot/test/test_slaves.py
  M buildbot/test/test_status.py
  M buildbot/test/test_steps.py
  M buildbot/test/test_vc.py
  M buildbot/test/test_web.py
  M buildbot/util.py
  M docs/buildbot.texinfo

Log Message:
-----------
Merge commit 'upstream/master'


Commit: 95a2433e397985d4705c647c789718ab2bddcf71
    http://github.com/djmitche/buildbot/commit/95a2433e397985d4705c647c789718ab2bddcf71
Author: Daniel Dunbar <daniel at zuster.org>
Date:   2009-12-27 (Sun, 27 Dec 2009)

Changed paths:
  M buildbot/locks.py

Log Message:
-----------
Revert change to include SlaveLock.maxCountForSlave in compare_attrs, it isn't
hashable and we rely on this. This fixes several buildbot.test.test_locks.Locks
I introduced.