From d2e94e36d64d4062ebe1fabac65ac1a6f265de17 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Wed, 30 Aug 2023 20:05:53 +0200
Subject: lifecycle config: add missing line in merge() and remove tracing

---
 src/model/bucket_table.rs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/model')

diff --git a/src/model/bucket_table.rs b/src/model/bucket_table.rs
index df2e9b4a..0eefa0e5 100644
--- a/src/model/bucket_table.rs
+++ b/src/model/bucket_table.rs
@@ -151,6 +151,7 @@ impl Crdt for BucketParams {
 
 		self.website_config.merge(&o.website_config);
 		self.cors_config.merge(&o.cors_config);
+		self.lifecycle_config.merge(&o.lifecycle_config);
 		self.quotas.merge(&o.quotas);
 	}
 }
-- 
cgit v1.2.3