Merge ~troyanov/maas:fix-2003940 into maas:master
Proposed by
Anton Troyanov
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Anton Troyanov | ||||
Approved revision: | 97283388f46f3cefb9b517aac7c13ce1f787c7aa | ||||
Merge reported by: | MAAS Lander | ||||
Merged at revision: | not available | ||||
Proposed branch: | ~troyanov/maas:fix-2003940 | ||||
Merge into: | maas:master | ||||
Diff against target: |
77 lines (+33/-3) 2 files modified
src/maasserver/websockets/handlers/machine.py (+15/-3) src/maasserver/websockets/handlers/tests/test_machine.py (+18/-0) |
||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
MAAS Lander | Approve | ||
Alberto Donato (community) | Approve | ||
Review via email:
|
Commit message
fix(ws): incorrect storage amount
Combining multiple aggregations with annotate() will yield the wrong results
because joins are used instead of subqueries.
See related Django bug: https:/
Resolves LP:2003940
To post a comment you must log in.
UNIT TESTS
-b fix-2003940 lp:~troyanov/maas/+git/maas into -b master lp:~maas-committers/maas
STATUS: FAILED maas-ci. internal: 8080/job/ maas-tester/ 2414/console a7049c41e70f69b f8e9900aed
LOG: http://
COMMIT: 7ba51c382953eff