f merge conflict

mozilla-services · Feb 27, 2024 · c9f4bf6 · c9f4bf6
1 parent 9bb651d
commit c9f4bf6
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/autopush-common/src/db/bigtable/mod.rs b/autopush-common/src/db/bigtable/mod.rs
@@ -73,6 +73,7 @@ pub struct BigTableDbSettings {
     #[serde(deserialize_with = "deserialize_opt_u32_to_duration")]
     pub database_pool_connection_ttl: Option<Duration>,
     /// Max idle time(in seconds) for a connection
+    #[serde(default)]
     #[serde(deserialize_with = "deserialize_opt_u32_to_duration")]
     pub database_pool_max_idle: Option<Duration>,
     /// Include route to leader header in metadata