Skip to content

Commit

Permalink
Revert "backport of commit 4b6ec40 (#20118)" (#20143)
Browse files Browse the repository at this point in the history
This reverts commit a9d2962.
  • Loading branch information
miagilepner committed Apr 13, 2023
1 parent c110d97 commit 4fa8fac
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 7 deletions.
3 changes: 0 additions & 3 deletions changelog/20078.txt

This file was deleted.

4 changes: 0 additions & 4 deletions vault/logical_system_activity.go
Original file line number Diff line number Diff line change
Expand Up @@ -348,10 +348,6 @@ func (b *SystemBackend) handleActivityConfigUpdate(ctx context.Context, req *log
return logical.ErrorResponse("retention_months cannot be 0 while enabled"), logical.ErrInvalidRequest
}

if a.core.censusLicensingEnabled && config.RetentionMonths < a.configOverrides.MinimumRetentionMonths {
return logical.ErrorResponse("retention_months must be at least %d while Reporting is enabled", a.configOverrides.MinimumRetentionMonths), logical.ErrInvalidRequest
}

// Store the config
entry, err := logical.StorageEntryJSON(path.Join(activitySubPath, activityConfigKey), config)
if err != nil {
Expand Down

0 comments on commit 4fa8fac

Please sign in to comment.