MAAS

Merge ~mpontillo/maas:delete-discoveries-by-mac-and-ip--forgotten-line into maas:master

  1. Git
  2. lp:~mpontillo/maas
  3. delete-discoveries-by-mac-and-ip--forgotten-line
  4. Merge into master
Proposed by Mike Pontillo
Status: Merged
Approved by: Mike Pontillo
Approved revision: 677e8e290210c1965ea2669635b0a8dfef91c6f5
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~mpontillo/maas:delete-discoveries-by-mac-and-ip--forgotten-line
Merge into: maas:master
Diff against target: 12 lines (+1/-0)
1 file modified
src/maasserver/websockets/handlers/discovery.py (+1/-0)
Reviewer Review Type Date Requested Status
Blake Rouse (community) Approve
MAAS Lander unittests Pending
Review via email: mp+363741@code.launchpad.net

Commit message

Fix missing delete_by_mac_and_ip in discovery handler allowed_methods.

To post a comment you must log in.
Revision history for this message
Blake Rouse (blake-rouse) wrote :

lgtm!

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/discovery.py b/src/maasserver/websockets/handlers/discovery.py
2index 4213c5b..07329b0 100644
3--- a/src/maasserver/websockets/handlers/discovery.py
4+++ b/src/maasserver/websockets/handlers/discovery.py
5@@ -35,6 +35,7 @@ class DiscoveryHandler(ViewModelHandler):
6 'list',
7 'get',
8 'clear',
9+ 'delete_by_mac_and_ip',
10 ]
11
12 def list(self, params):

Subscribers

People subscribed via source and target branches