From 7c39337b2305a855ba62d4ca2923309854209130 Mon Sep 17 00:00:00 2001 From: iliana etaoin Date: Fri, 24 Jun 2022 18:02:38 +0000 Subject: [PATCH] fix merge issue between #1253 and #1265 --- nexus/src/external_api/http_entrypoints.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nexus/src/external_api/http_entrypoints.rs b/nexus/src/external_api/http_entrypoints.rs index 3435a399d1..a0e8c806e0 100644 --- a/nexus/src/external_api/http_entrypoints.rs +++ b/nexus/src/external_api/http_entrypoints.rs @@ -1077,7 +1077,11 @@ async fn ip_pools_get( .into_iter() .map(IpPool::from) .collect(); - Ok(HttpResponseOk(ScanByNameOrId::results_page(&query, pools)?)) + Ok(HttpResponseOk(ScanByNameOrId::results_page( + &query, + pools, + &marker_for_name_or_id, + )?)) }; apictx.external_latencies.instrument_dropshot_handler(&rqctx, handler).await }