[Buildbot-commits] [buildbot/buildbot] b782c6: ec2buildslave: Fix import error with EC2LatentBuil...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/buildbot/buildbot
  Commit: b782c603e6a4dfb418109bab4e233a41d8df9570
      https://github.com/buildbot/buildbot/commit/b782c603e6a4dfb418109bab4e233a41d8df9570
  Author: Olof Johansson <olofjn at axis.com>
  Date:   2013-09-04 (Wed, 04 Sep 2013)

  Changed paths:
    M master/buildbot/ec2buildslave.py

  Log Message:
  -----------
  ec2buildslave: Fix import error with EC2LatentBuildSlave

The migration module buildbot.ec2buildslave tried to import
EC2LatentBuildSlave from buildbot.buildslave.libvirt, but that class
lives in buildbot.buildslave.ec2, causing a import error when loading
the module.


  Commit: 2a0ed4d719c4291e14a46e42dcce9ef4dff3749a
      https://github.com/buildbot/buildbot/commit/2a0ed4d719c4291e14a46e42dcce9ef4dff3749a
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-09-07 (Sat, 07 Sep 2013)

  Changed paths:
    M master/buildbot/ec2buildslave.py

  Log Message:
  -----------
  Merge branch 'topic/ec2buildslave_import_error' of git://github.com/olof/buildbot


Compare: https://github.com/buildbot/buildbot/compare/5cf2263724e9...2a0ed4d719c4