Merge branch 'main' into problame/move-pageserver-config-into-api-crate

2026-05-29 11:00:38 +00:00 · 2024-05-03 15:20:24 +00:00
parent 4a72fe0908 a3fe12b6d8
commit 700aa96770
20 changed files with 801 additions and 163 deletions
--- a/control_plane/src/local_env.rs
+++ b/control_plane/src/local_env.rs
@@ -382,7 +382,10 @@ impl LocalEnv {

        // Find neon binaries.
        if env.neon_distrib_dir == Path::new("") {
-            env.neon_distrib_dir = env::current_exe()?.parent().unwrap().to_owned();
+            env::current_exe()?
+                .parent()
+                .unwrap()
+                .clone_into(&mut env.neon_distrib_dir);
        }

        if env.pageservers.is_empty() {