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/machine.py (+2/-0)
Reviewer Review Type Date Requested Status
MAAS Lander Approve
Adam Collard Approve
Review via email: mp+395419@code.launchpad.net

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 :

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

STATUS: SUCCESS
COMMIT: 17d9f369b18e5daa7053a3aba2267b18f2223534

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/src/maasserver/websockets/handlers/machine.py b/src/maasserver/websockets/handlers/machine.py
index 76a8b46..469e072 100644
--- a/src/maasserver/websockets/handlers/machine.py
+++ b/src/maasserver/websockets/handlers/machine.py
@@ -199,6 +199,8 @@ class MachineHandler(NodeHandler):
199 "set_script_result_unsuppressed",199 "set_script_result_unsuppressed",
200 "get_suppressible_script_results",200 "get_suppressible_script_results",
201 "get_latest_failed_testing_script_results",201 "get_latest_failed_testing_script_results",
202 "get_owner_data",
203 "set_owner_data",
202 ]204 ]
203 form = AdminMachineWithMACAddressesForm205 form = AdminMachineWithMACAddressesForm
204 exclude = [206 exclude = [

Subscribers

People subscribed via source and target branches