diff options
| author | Alex Auvolat <alex@adnab.me> | 2022-01-03 18:32:15 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2022-01-04 12:52:47 +0100 |
| commit | 1bcd6fabbdc0cd9dee88ba28daecb5339f2c13ec (patch) | |
| tree | 6a812200ac8e049c21702ae1623a516d6e274f28 /src/model/bucket_table.rs | |
| parent | ba7f268b990cd17c5d20bf9e0eb6ff77d30fe845 (diff) | |
| download | garage-1bcd6fabbdc0cd9dee88ba28daecb5339f2c13ec.tar.gz garage-1bcd6fabbdc0cd9dee88ba28daecb5339f2c13ec.zip | |
New buckets for 0.6.0: small changes
- Fix bucket delete
- fix merge of bucket creation date
- Replace deletable with option in aliases
Rationale: if two aliases point to conflicting bucket, resolving
by making an arbitrary choice risks making data accessible when it
shouldn't be. We'd rather resolve to deleting the alias until
someone puts it back.
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 fef29b62..52c2316c 100644 --- a/src/model/bucket_table.rs +++ b/src/model/bucket_table.rs @@ -63,6 +63,7 @@ impl BucketParams { impl Crdt for BucketParams { fn merge(&mut self, o: &Self) { + self.creation_date = std::cmp::min(self.creation_date, o.creation_date); self.authorized_keys.merge(&o.authorized_keys); self.website_config.merge(&o.website_config); self.aliases.merge(&o.aliases); |