MAAS

Merge lp:~allenap/maas/dhcp-leases-parsing-wire-up--1.5 into lp:maas/1.5

  1. dhcp-leases-parsing-wire-up--1.5
  2. Merge into 1.5
Proposed by Gavin Panella
Status: Merged
Approved by: Gavin Panella
Approved revision: no longer in the source branch.
Merged at revision: 2274
Proposed branch: lp:~allenap/maas/dhcp-leases-parsing-wire-up--1.5
Merge into: lp:maas/1.5
Prerequisite: lp:~allenap/maas/dhcp-leases-parsing--1.5
Diff against target: 12 lines (+1/-1)
1 file modified
src/provisioningserver/dhcp/leases.py (+1/-1)
To merge this branch: bzr merge lp:~allenap/maas/dhcp-leases-parsing-wire-up--1.5
Reviewer Review Type Date Requested Status
Gavin Panella (community) Approve
Review via email: mp+220106@code.launchpad.net

Commit message

Backport from trunk r2337: Enable the new, faster, DHCP lease parser.

To post a comment you must log in.
Revision history for this message
Gavin Panella (allenap) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/provisioningserver/dhcp/leases.py'
2--- src/provisioningserver/dhcp/leases.py 2013-10-07 09:12:40 +0000
3+++ src/provisioningserver/dhcp/leases.py 2014-05-19 16:48:21 +0000
4@@ -54,7 +54,7 @@
5 get_recorded_nodegroup_uuid,
6 )
7 from provisioningserver.cluster_config import get_maas_url
8-from provisioningserver.dhcp.leases_parser import parse_leases
9+from provisioningserver.dhcp.leases_parser_fast import parse_leases
10
11
12 logger = getLogger(__name__)

Subscribers

People subscribed via source and target branches

to all changes: