Merge ~adam-collard/maas:fix-1884112-count-aggregate into maas:master
Proposed by
Adam Collard
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Adam Collard | ||||
Approved revision: | 5fa7469193404631d52032fee086dcd4efc6b1f5 | ||||
Merged at revision: | 020f9684cb4181535de0ccd5c299a093be8b5100 | ||||
Proposed branch: | ~adam-collard/maas:fix-1884112-count-aggregate | ||||
Merge into: | maas:master | ||||
Diff against target: |
80 lines (+24/-5) 2 files modified
src/maasserver/websockets/handlers/tests/test_user.py (+21/-3) src/maasserver/websockets/handlers/user.py (+3/-2) |
||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Björn Tillenius | Approve | ||
MAAS Lander | Approve | ||
Dougal Matthews (community) | Approve | ||
Review via email: mp+386092@code.launchpad.net |
Commit message
Use distinct=True to avoid Django gotcha with multiple aggregations
Fixes LP:1884112, work around https:/
To post a comment you must log in.
UNIT TESTS count-aggregate lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas
-b fix-1884112-
STATUS: FAILED maas-ci. internal: 8080/job/ maas/job/ branch- tester/ 7747/console 8e3303c037a9103 5f80c44f09
LOG: http://
COMMIT: 5e3dcfa4f367878