Skip to content

K
k3s
Unverified Commit f7615299 authored by Brian Downs's avatar Brian Downs Committed by GitHub
Browse files
Options

Merge pull request #3198 from briandowns/backport_3197_1.19

[Backport 1.19] - Resolve local retention issue when S3 in use.
parents dc1d86e6 0f3fe02e
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 2 deletions
pkg/etcd/etcd.go
View file @ f7615299
...@@ -827,8 +827,6 @@ func (e *ETCD) Snapshot(ctx context.Context, config *config.Control) error { ...@@ -827,8 +827,6 @@ func (e *ETCD) Snapshot(ctx context.Context, config *config.Control) error {
return errors.Wrap(err, "failed to apply s3 snapshot retention") return errors.Wrap(err, "failed to apply s3 snapshot retention")
} }
} }
return nil
} }
// check if we need to perform a retention check // check if we need to perform a retention check
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment