diff options
| author | Alex Auvolat <alex@adnab.me> | 2023-08-30 20:05:53 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2023-08-30 20:05:53 +0200 |
| commit | d2e94e36d64d4062ebe1fabac65ac1a6f265de17 (patch) | |
| tree | 0e7aac36371ae688ed97a53b89a7da4c361b58ae /src/model/bucket_table.rs | |
| parent | 75ccc5a95c76f31235fcaab8a2c1795693733a4b (diff) | |
| download | garage-d2e94e36d64d4062ebe1fabac65ac1a6f265de17.tar.gz garage-d2e94e36d64d4062ebe1fabac65ac1a6f265de17.zip | |
lifecycle config: add missing line in merge() and remove tracing
Diffstat (limited to 'src/model/bucket_table.rs')
| -rw-r--r-- | src/model/bucket_table.rs | 1 |
1 files changed, 1 insertions, 0 deletions
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); } } |