Merge ~d0ugal/maas:allow-owner-data-methods into maas:master

Proposed by Dougal Matthews
Status: Merged
Approved by: Dougal Matthews
Approved revision: 17d9f369b18e5daa7053a3aba2267b18f2223534
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~d0ugal/maas:allow-owner-data-methods
Merge into: maas:master
Diff against target: 13 lines (+2/-0)
1 file modified
src/maasserver/websockets/handlers/ (+2/-0)
Reviewer Review Type Date Requested Status
MAAS Lander Approve
Adam Collard Approve
Review via email:

Commit message

Allow use of the OwnerData websocket methods

To post a comment you must log in.
Revision history for this message
Adam Collard (adam-collard) :
review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

-b allow-owner-data-methods lp:~d0ugal/maas/+git/maas into -b master lp:~maas-committers/maas

COMMIT: 17d9f369b18e5daa7053a3aba2267b18f2223534

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/maasserver/websockets/handlers/ b/src/maasserver/websockets/handlers/
2index 76a8b46..469e072 100644
3--- a/src/maasserver/websockets/handlers/
4+++ b/src/maasserver/websockets/handlers/
5@@ -199,6 +199,8 @@ class MachineHandler(NodeHandler):
6 "set_script_result_unsuppressed",
7 "get_suppressible_script_results",
8 "get_latest_failed_testing_script_results",
9+ "get_owner_data",
10+ "set_owner_data",
11 ]
12 form = AdminMachineWithMACAddressesForm
13 exclude = [


People subscribed via source and target branches