Last commit made on 2020-05-16
Get this branch:
git clone -b 2.4
Members of MAAS Committers can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

144fc57... by Lee Trager on 2020-05-16

Backport of 9424d23 LP: #1869958 - Run fio using the native block size of the disk.

b8bd616... by Lee Trager on 2020-04-17

Backport of c25d426 LP: #1870171 - Remove token associations when transferring ownership of a Node.

ea35aa5... by Lee Trager on 2020-04-11

Backport of d0653c9 LP: #1870171 - Remove the token column from the Node table.

The token column is only used by the API when allocating and machine and
listing allocated machines. When a User Token is deleted this association
causes the Node to be deleted as well. Allocated machines are already
filtered by owner and status so the token column isn't needed.

In the backport Node.token is no longer used but the column remains to
avoid creating a migration.

cae0153... by Blake Rouse on 2019-11-01

Release 2.4.3

000f1aa... by Blake Rouse on 2019-10-18

Fixes LP: #1710278 - Notice when bind9 is hung, force kill the service, ensure it starts again, then perform a reload.

Backport of d0a4ec6ce2af49d00431c0d7ad4c5164d3951e1a.

9d085c7... by Björn Tillenius on 2019-10-18

LP #1845351: MAAS sometimes get in a state where machine tags aren't updated from their definitions

Don't use a proxy for the rack-region API communication.

We require the rack to have direct access to the region without going
through a proxy.

Using a proxy for the rack-region communication (HTTP API only) has
partly worked, but been broken.

This fixes the test_check_tag_applied_to_all_machines() failure that
fails intermittently in CI.

(cherry picked from commit 4eee730d67082731ed43fe1075a4ce883fcd3823)

197c04f... by Björn Tillenius on 2019-10-18

Don't run JS tests for Chrome/Chromium since they don't work in the

Given that we only backport critical isssues to 2.4, running the JS
tests with PhantomJS only should be acceptable.

cd4738e... by Mike Pontillo on 2019-04-10

LP: #1788780 - Ignore tunnel interfaces (such as those created by hypervisors) when gathering interfaces for MAAS management.

Backport of 842646142d42d95453f4b64c209f93b09f8aea7c

fab9311... by Mike Pontillo on 2018-12-11

Backport 594f8f8bb: LP #1803188: Prevent creation of multiple IPs (per subnet, per interface) during commissioning.

In some situations, the IP address from the preboot environment differs
from the IP address acquired by the DHCP client during commissioning. This
results in MAAS linking the interface to the subnet twice, which is
unexpected and can cause problems for future usage of the machine.

402d66e... by Andres Rodriguez on 2018-12-10

debian/changelog: Update to match 2.4.2 and open 2.4.3