Skip to content

Commit

Permalink
fix merge issue between #1253 and #1265
Browse files Browse the repository at this point in the history
  • Loading branch information
iliana committed Jun 24, 2022
1 parent deab7db commit 7c39337
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion nexus/src/external_api/http_entrypoints.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down

0 comments on commit 7c39337

Please sign in to comment.