[Buildbot-commits] [buildbot/buildbot] daa659: Merge branch 'buildbot-0.8.7'

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/buildbot/buildbot
  Commit: daa659cb4e0c83c94fb90445bf179e74126c3f2d
      https://github.com/buildbot/buildbot/commit/daa659cb4e0c83c94fb90445bf179e74126c3f2d
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-12-08 (Sat, 08 Dec 2012)

  Changed paths:
    M master/buildbot/buildslave.py
    M master/buildbot/process/users/users.py
    M master/buildbot/schedulers/timed.py
    M master/buildbot/steps/source/bzr.py
    M master/buildbot/steps/source/git.py
    M master/buildbot/steps/source/mercurial.py
    M master/buildbot/steps/source/svn.py
    M master/buildbot/test/unit/test_schedulers_timed_NightlyBase.py
    M master/buildbot/test/unit/test_steps_source_bzr.py
    M master/buildbot/test/unit/test_steps_source_git.py
    M master/buildbot/test/unit/test_steps_source_mercurial.py
    M master/buildbot/test/unit/test_steps_source_svn.py
    M master/buildbot/util/sautils.py
    M master/docs/manual/cfg-buildsteps.rst
    M master/docs/manual/cfg-global.rst
    M master/setup.py

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

Conflicts:
	master/buildbot/steps/source/svn.py


  Commit: 5b3a4c88f0d65ea742792eddc45f630367e3acef
      https://github.com/buildbot/buildbot/commit/5b3a4c88f0d65ea742792eddc45f630367e3acef
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2012-12-08 (Sat, 08 Dec 2012)

  Changed paths:
    M master/buildbot/steps/source/bzr.py
    M master/buildbot/steps/source/git.py
    M master/buildbot/steps/source/mercurial.py

  Log Message:
  -----------
  Update bzr, git, and hg to use pathExists.


Compare: https://github.com/buildbot/buildbot/compare/fc89785b24d1...5b3a4c88f0d6