aboutsummaryrefslogtreecommitdiff
path: root/src/model/bucket_table.rs
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2020-11-20 20:12:32 +0100
committerAlex Auvolat <alex@adnab.me>2020-11-20 20:12:32 +0100
commit2dc9a4802279a0b7e742f8cf2e2cc85956bb7f83 (patch)
treedd0a52aa12a89ee37cf6e4be2afeefd23ba88f72 /src/model/bucket_table.rs
parente9fd265ce6d326425994ccfea9d5afc7165460db (diff)
downloadgarage-2dc9a4802279a0b7e742f8cf2e2cc85956bb7f83.tar.gz
garage-2dc9a4802279a0b7e742f8cf2e2cc85956bb7f83.zip
Fix reconciliation logic
Diffstat (limited to 'src/model/bucket_table.rs')
-rw-r--r--src/model/bucket_table.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/model/bucket_table.rs b/src/model/bucket_table.rs
index adfb3370..35c0cc27 100644
--- a/src/model/bucket_table.rs
+++ b/src/model/bucket_table.rs
@@ -75,7 +75,7 @@ impl Entry<EmptyKey, String> for Bucket {
}
fn merge(&mut self, other: &Self) {
- if other.timestamp < self.timestamp {
+ if other.timestamp > self.timestamp {
*self = other.clone();
return;
}