diff --git a/control_plane/src/local_env.rs b/control_plane/src/local_env.rs index ac6eb0bfb5..f3da897eda 100644 --- a/control_plane/src/local_env.rs +++ b/control_plane/src/local_env.rs @@ -138,7 +138,10 @@ pub fn init_repo(local_env: &mut LocalEnv) -> Result<()> { .arg("--no-instructions") .env_clear() .env("LD_LIBRARY_PATH", local_env.pg_lib_dir().to_str().unwrap()) - .env("DYLD_LIBRARY_PATH", local_env.pg_lib_dir().to_str().unwrap()) + .env( + "DYLD_LIBRARY_PATH", + local_env.pg_lib_dir().to_str().unwrap(), + ) .stdout(Stdio::null()) .status() .with_context(|| "failed to execute initdb")?; diff --git a/pageserver/src/bin/pageserver.rs b/pageserver/src/bin/pageserver.rs index 6fd53544de..23e0d5e57b 100644 --- a/pageserver/src/bin/pageserver.rs +++ b/pageserver/src/bin/pageserver.rs @@ -20,7 +20,7 @@ use slog::Drain; use pageserver::{page_service, tui, zenith_repo_dir, PageServerConf}; const DEFAULT_GC_HORIZON: u64 = 0; //64 * 1024 * 1024; -const DEFAULT_GC_PERIOD_SEC: u32 = 1; +const DEFAULT_GC_PERIOD_SEC: u64 = 1; fn main() -> Result<()> { let arg_matches = App::new("Zenith page server") diff --git a/vendor/postgres b/vendor/postgres index 77624689b7..fc5ffb678d 160000 --- a/vendor/postgres +++ b/vendor/postgres @@ -1 +1 @@ -Subproject commit 77624689b7c93a3285186900a4dc51965d6761b6 +Subproject commit fc5ffb678d4f7d9384b1a0ce6dff9295769a63f8