Attempt to merge into lp:maas failed due to conflicts:
text conflict in src/maasserver/api/machines.py text conflict in src/maasserver/api/tests/test_machine.py
« Back to merge proposal
Attempt to merge into lp:maas failed due to conflicts:
text conflict in src/maasserver/ api/machines. py api/tests/ test_machine. py
text conflict in src/maasserver/