Merge lp:~allenap/maas/do-not-import-reactor-from-crochet into lp:maas/1.9

Proposed by Gavin Panella
Status: Rejected
Rejected by: Gavin Panella
Proposed branch: lp:~allenap/maas/do-not-import-reactor-from-crochet
Merge into: lp:maas/1.9
Diff against target: 23 lines (+4/-2)
1 file modified
src/maasserver/rpc/ (+4/-2)
To merge this branch: bzr merge lp:~allenap/maas/do-not-import-reactor-from-crochet
Reviewer Review Type Date Requested Status
Gavin Panella (community) Approve
Review via email:

Commit message

Import Twisted's reactor from twisted.internet.

Crochet no longer re-exports Twisted's reactor.

To post a comment you must log in.
Revision history for this message
Gavin Panella (allenap) wrote :

Trivial; selfie.

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :
Download full text (1.4 MiB)

The attempt to merge lp:~allenap/maas/do-not-import-reactor-from-crochet into lp:maas/1.9 failed. Below is the output from the failed tests.

Ign trusty InRelease
Hit trusty-security InRelease
Get:1 trusty-updates InRelease [64.4 kB]
Hit trusty-backports InRelease
Hit trusty Release.gpg
Hit trusty Release
Get:2 trusty-updates/main Sources [248 kB]
Get:3 trusty-updates/restricted Sources [5,359 B]
Get:4 trusty-updates/universe Sources [147 kB]
Get:5 trusty-updates/multiverse Sources [5,161 B]
Get:6 trusty-updates/main amd64 Packages [689 kB]
Get:7 trusty-updates/restricted amd64 Packages [15.9 kB]
Get:8 trusty-updates/universe amd64 Packages [335 kB]
Get:9 trusty-updates/multiverse amd64 Packages [13.0 kB]
Hit trusty-updates/main Translation-en
Hit trusty-updates/multiverse Translation-en
Hit trusty-updates/restricted Translation-en
Hit trusty-updates/universe Translation-en
Hit trusty-backports/main Sources
Hit trusty-backports/restricted Sources
Hit trusty-backports/universe Sources
Hit trusty-backports/multiverse Sources
Hit trusty-backports/main amd64 Packages
Hit trusty-backports/restricted amd64 Packages
Hit trusty-backports/universe amd64 Packages
Hit trusty-backports/multiverse amd64 Packages
Hit trusty-backports/main Translation-en
Hit trusty-backports/multiverse Translation-en
Hit trusty-backports/restricted Translation-en
Hit trusty-backports/universe Translation-en
Hit trusty/main Sources
Hit trusty/restricted Sources
Hit trusty/universe Sources
Hit trusty/multiverse Sources
Hit http://s...